Print this page
patch tsoome-feedback
@@ -107,11 +107,10 @@
}
static int
method_geterror(nvlist_t *nvl, int err, int *errp)
{
- if (nvl != NULL)
nvlist_free(nvl);
*errp = err;
return (-1);
@@ -163,11 +162,10 @@
ret = nvlist_lookup_uint32(nvl, TOPO_PROP_VAL_TYPE, (uint32_t *)&type);
if (ret != 0 || type != pv->tp_type)
return (method_geterror(nvl, ETOPO_PROP_TYPE, err));
/* Release the last value and re-assign to the new value */
- if (pv->tp_val != NULL)
nvlist_free(pv->tp_val);
pv->tp_val = nvl;
return (0);
}
@@ -853,11 +851,10 @@
topo_hdl_t *thp = node->tn_hdl;
if (pm != NULL) {
if (pm->tpm_name != NULL)
topo_hdl_strfree(thp, pm->tpm_name);
- if (pm->tpm_args != NULL)
nvlist_free(pm->tpm_args);
topo_hdl_free(thp, pm, sizeof (topo_propmethod_t));
}
*errp = err;
@@ -1305,11 +1302,10 @@
pm = pv->tp_method;
if (pm != NULL) {
if (pm->tpm_name != NULL)
topo_hdl_strfree(thp, pm->tpm_name);
- if (pm->tpm_args != NULL)
nvlist_free(pm->tpm_args);
topo_hdl_free(thp, pm, sizeof (topo_propmethod_t));
pv->tp_method = NULL;
}
}
@@ -1325,11 +1321,10 @@
thp = pv->tp_hdl;
if (pv->tp_name != NULL)
topo_hdl_strfree(thp, pv->tp_name);
- if (pv->tp_val != NULL)
nvlist_free(pv->tp_val);
propmethod_destroy(thp, pv);
topo_hdl_free(thp, pv, sizeof (topo_propval_t));
@@ -1401,11 +1396,10 @@
static int
get_pgrp_seterror(tnode_t *node, nvlist_t *nvl, int *errp, int err)
{
topo_node_unlock(node);
- if (nvl != NULL)
nvlist_free(nvl);
*errp = err;
return (-1);
@@ -1474,11 +1468,10 @@
static nvlist_t *
get_all_seterror(tnode_t *node, nvlist_t *nvl, int *errp, int err)
{
topo_node_unlock(node);
- if (nvl != NULL)
nvlist_free(nvl);
*errp = err;
return (NULL);