Print this page
patch tsoome-feedback
*** 107,117 ****
}
static int
method_geterror(nvlist_t *nvl, int err, int *errp)
{
- if (nvl != NULL)
nvlist_free(nvl);
*errp = err;
return (-1);
--- 107,116 ----
*** 163,173 ****
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);
}
--- 162,171 ----
*** 853,863 ****
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;
--- 851,860 ----
*** 1305,1315 ****
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;
}
}
--- 1302,1311 ----
*** 1325,1335 ****
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));
--- 1321,1330 ----
*** 1401,1411 ****
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);
--- 1396,1405 ----
*** 1474,1484 ****
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);
--- 1468,1477 ----