diff options
Diffstat (limited to 'usr/src/cmd/fm/modules/common')
8 files changed, 21 insertions, 43 deletions
diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c b/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c index d4d4fe3de9..4a4c5aa8c3 100644 --- a/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c +++ b/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Disk & Indicator Monitor configuration file support routines */ @@ -375,16 +373,14 @@ diskmon_free(diskmon_t *dmp) while (dmp != NULL) { nextp = dmp->next; - if (dmp->props) - nvlist_free(dmp->props); + nvlist_free(dmp->props); if (dmp->location) dstrfree(dmp->location); if (dmp->ind_list) ind_free(dmp->ind_list); if (dmp->indrule_list) indrule_free(dmp->indrule_list); - if (dmp->app_props) - nvlist_free(dmp->app_props); + nvlist_free(dmp->app_props); if (dmp->frup) dmfru_free(dmp->frup); dfree(dmp, sizeof (diskmon_t)); diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c b/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c index 7580f05748..48ea360c46 100644 --- a/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c +++ b/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c @@ -707,14 +707,12 @@ topo_add_bay(topo_hdl_t *thp, tnode_t *node, walk_diskmon_t *wdp) } else if (diskp != NULL) { diskmon_free(diskp); } else { - if (dmap_nvl) - nvlist_free(dmap_nvl); + nvlist_free(dmap_nvl); if (indp) ind_free(indp); if (indrp) indrule_free(indrp); - if (diskprops) - nvlist_free(diskprops); + nvlist_free(diskprops); } wdp->pfmri = cstr; diff --git a/usr/src/cmd/fm/modules/common/eversholt/fme.c b/usr/src/cmd/fm/modules/common/eversholt/fme.c index 8113230bf3..096caa73db 100644 --- a/usr/src/cmd/fm/modules/common/eversholt/fme.c +++ b/usr/src/cmd/fm/modules/common/eversholt/fme.c @@ -1701,8 +1701,7 @@ fme_receive_report(fmd_hdl_t *hdl, fmd_event_t *ffep, ipath_print(O_ALTFP|O_NONL, eventstring, ipp); out(O_ALTFP, " explained by FME%d]", fmep->id); - if (pre_peek_nvp) - nvlist_free(pre_peek_nvp); + nvlist_free(pre_peek_nvp); if (ep->count == 1) serialize_observation(fmep, eventstring, ipp); @@ -2028,16 +2027,14 @@ node2fmri(struct node *n) err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth); if (err == 0) { for (i = 0; i < depth; i++) - if (pa[i] != NULL) - nvlist_free(pa[i]); + nvlist_free(pa[i]); return (f); } failure = "addition of hc-pair array to FMRI failed"; boom: for (i = 0; i < depth; i++) - if (pa[i] != NULL) - nvlist_free(pa[i]); + nvlist_free(pa[i]); nvlist_free(f); out(O_DIE, "%s", failure); /*NOTREACHED*/ @@ -2101,16 +2098,14 @@ ipath2fmri(struct ipath *ipath) err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth); if (err == 0) { for (i = 0; i < depth; i++) - if (pa[i] != NULL) - nvlist_free(pa[i]); + nvlist_free(pa[i]); return (f); } failure = "addition of hc-pair array to FMRI failed"; boom: for (i = 0; i < depth; i++) - if (pa[i] != NULL) - nvlist_free(pa[i]); + nvlist_free(pa[i]); nvlist_free(f); out(O_DIE, "%s", failure); /*NOTREACHED*/ @@ -2141,11 +2136,9 @@ static void publish_suspects(struct fme *fmep, struct rsl *srl); static void rslfree(struct rsl *freeme) { - if (freeme->asru != NULL) - nvlist_free(freeme->asru); - if (freeme->fru != NULL) - nvlist_free(freeme->fru); - if (freeme->rsrc != NULL && freeme->rsrc != freeme->asru) + nvlist_free(freeme->asru); + nvlist_free(freeme->fru); + if (freeme->rsrc != freeme->asru) nvlist_free(freeme->rsrc); } diff --git a/usr/src/cmd/fm/modules/common/eversholt/itree.c b/usr/src/cmd/fm/modules/common/eversholt/itree.c index d27459fa05..fd32e81b0b 100644 --- a/usr/src/cmd/fm/modules/common/eversholt/itree.c +++ b/usr/src/cmd/fm/modules/common/eversholt/itree.c @@ -1727,8 +1727,7 @@ itree_destructor(void *left, void *right, void *arg) bub = nextbub; } - if (ep->nvp != NULL) - nvlist_free(ep->nvp); + nvlist_free(ep->nvp); alloc_xfree(ep, sizeof (*ep)); } @@ -1759,8 +1758,7 @@ itree_pruner(void *left, void *right, void *arg) bub = nextbub; } - if (ep->nvp != NULL) - nvlist_free(ep->nvp); + nvlist_free(ep->nvp); ep->props = NULL; ep->payloadprops = NULL; ep->serdprops = NULL; diff --git a/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c b/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c index a83d2e6e50..557997ecac 100644 --- a/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c +++ b/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c @@ -287,12 +287,9 @@ fmevt_detector(nvlist_t *attr, char *ruleset, int user, int priv, err += nvlist_add_nvlist(dtcr, FM_FMRI_SW_CTXT, ctxt); done: - if (obj != NULL) - nvlist_free(obj); - if (site != NULL) - nvlist_free(site); - if (ctxt != NULL) - nvlist_free(ctxt); + nvlist_free(obj); + nvlist_free(site); + nvlist_free(ctxt); if (err == 0) { return (dtcr); @@ -556,8 +553,7 @@ done: if (ruleset) free(ruleset); - if (rawattr) - nvlist_free(rawattr); + nvlist_free(rawattr); return (0); /* in all cases consider the event delivered */ } diff --git a/usr/src/cmd/fm/modules/common/ip-transport/ip.c b/usr/src/cmd/fm/modules/common/ip-transport/ip.c index e338dd7f3e..ea05fc8c28 100644 --- a/usr/src/cmd/fm/modules/common/ip-transport/ip.c +++ b/usr/src/cmd/fm/modules/common/ip-transport/ip.c @@ -1056,8 +1056,7 @@ _fmd_fini(fmd_hdl_t *hdl) while (ip_xps != NULL) ip_xprt_destroy(ip_xps); - if (ip_auth != NULL) - nvlist_free(ip_auth); + nvlist_free(ip_auth); ip_addr_cleanup(); diff --git a/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c b/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c index 399f3f7676..48f9ff5dd3 100644 --- a/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c +++ b/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c @@ -182,8 +182,7 @@ panic_sw_fmri(fmd_hdl_t *hdl, char *object) sw_obj = fmd_nvl_alloc(hdl, FMD_SLEEP); err |= nvlist_add_string(sw_obj, FM_FMRI_SW_OBJ_PATH, object); err |= nvlist_add_nvlist(fmri, FM_FMRI_SW_OBJ, sw_obj); - if (sw_obj) - nvlist_free(sw_obj); + nvlist_free(sw_obj); if (!err) return (fmri); else diff --git a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c index ffa3bac6a8..8f54d3493c 100644 --- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c +++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c @@ -181,8 +181,7 @@ free_notify_prefs(fmd_hdl_t *hdl, nvlist_t **prefs, uint_t nprefs) int i; for (i = 0; i < nprefs; i++) { - if (prefs[i]) - nvlist_free(prefs[i]); + nvlist_free(prefs[i]); } fmd_hdl_free(hdl, prefs, sizeof (nvlist_t *) * nprefs); |