Print this page
patch tsoome-feedback
@@ -21,12 +21,10 @@
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Routines for traversing and packing/unpacking the handle
* returned from ri_init.
*/
@@ -80,11 +78,10 @@
{
ri_dev_t *dev;
assert(ap != NULL);
- if (ap->conf_props != NULL)
nvlist_free(ap->conf_props);
while ((dev = ap->cpus) != NULL) {
ap->cpus = dev->next;
ri_dev_free(dev);
@@ -118,13 +115,11 @@
void
ri_client_free(ri_client_t *client)
{
assert(client != NULL);
- if (client->usg_props != NULL)
nvlist_free(client->usg_props);
- if (client->v_props != NULL)
nvlist_free(client->v_props);
free(client);
}
/*
@@ -194,11 +189,10 @@
return (RI_SUCCESS);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (RI_FAILURE);
}
@@ -248,11 +242,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -302,11 +295,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -357,11 +349,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -422,11 +413,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -468,11 +458,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -513,11 +502,10 @@
return (0);
fail:
s_free(buf);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -615,11 +603,10 @@
return (0);
fail:
free(ri_hdl);
- if (nvl != NULL)
nvlist_free(nvl);
return (-1);
}
@@ -669,11 +656,10 @@
*aps = aplist;
return (0);
fail:
- if (nvl != NULL)
nvlist_free(nvl);
if (aplist != NULL) {
while ((tmp = aplist) != NULL) {
aplist = aplist->next;
ri_ap_free(tmp);
@@ -727,11 +713,10 @@
*devs = devlist;
return (0);
fail:
- if (nvl != NULL)
nvlist_free(nvl);
if (devlist != NULL) {
while ((tmp = devlist) != NULL) {
devlist = devlist->next;
ri_dev_free(tmp);
@@ -787,11 +772,10 @@
*clients = client_list;
return (0);
fail:
- if (nvl != NULL)
nvlist_free(nvl);
if (client_list != NULL) {
while ((tmp = client_list) != NULL) {
client_list = client_list->next;
ri_client_free(tmp);