Print this page
patch tsoome-feedback
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c
          +++ new/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c
↓ open down ↓ 279 lines elided ↑ open up ↑
 280  280  
 281  281          /* Put it all together */
 282  282  
 283  283          err += nvlist_add_uint8(dtcr, FM_VERSION, SW_SCHEME_VERSION0);
 284  284          err += nvlist_add_string(dtcr, FM_FMRI_SCHEME, FM_FMRI_SCHEME_SW);
 285  285          err += nvlist_add_nvlist(dtcr, FM_FMRI_SW_OBJ, obj);
 286  286          err += nvlist_add_nvlist(dtcr, FM_FMRI_SW_SITE, site);
 287  287          err += nvlist_add_nvlist(dtcr, FM_FMRI_SW_CTXT, ctxt);
 288  288  
 289  289  done:
 290      -        if (obj != NULL)
 291      -                nvlist_free(obj);
 292      -        if (site != NULL)
 293      -                nvlist_free(site);
 294      -        if (ctxt != NULL)
 295      -                nvlist_free(ctxt);
      290 +        nvlist_free(obj);
      291 +        nvlist_free(site);
      292 +        nvlist_free(ctxt);
 296  293  
 297  294          if (err == 0) {
 298  295                  return (dtcr);
 299  296          } else {
 300  297                  nvlist_free(dtcr);
 301  298                  return (NULL);
 302  299          }
 303  300  }
 304  301  
 305  302  static int
↓ open down ↓ 243 lines elided ↑ open up ↑
 549  546          (void) pthread_mutex_lock(&fmevt_lock);
 550  547  
 551  548          if (--fmevt_xprt_refcnt == 0 && fmevt_exiting)
 552  549                  (void) pthread_cond_broadcast(&fmevt_cv);
 553  550  
 554  551          (void) pthread_mutex_unlock(&fmevt_lock);
 555  552  
 556  553          if (ruleset)
 557  554                  free(ruleset);
 558  555  
 559      -        if (rawattr)
 560      -                nvlist_free(rawattr);
      556 +        nvlist_free(rawattr);
 561  557  
 562  558          return (0);     /* in all cases consider the event delivered */
 563  559  }
 564  560  
 565  561  void
 566  562  fmevt_init_inbound(fmd_hdl_t *hdl)
 567  563  {
 568  564          char *sidpfx;
 569  565          zoneid_t zoneid;
 570  566          int i;
↓ open down ↓ 88 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX