Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fm/schemes/hc/scheme.c
          +++ new/usr/src/cmd/fm/schemes/hc/scheme.c
↓ open down ↓ 219 lines elided ↑ open up ↑
 220  220          if (f1 != NULL && f2 != NULL) {
 221  221                  (void) nvlist_lookup_nvlist_array(f1, FM_FMRI_HC_LIST, &h1,
 222  222                      &h1sz);
 223  223                  (void) nvlist_lookup_nvlist_array(f2, FM_FMRI_HC_LIST, &h2,
 224  224                      &h2sz);
 225  225                  if (h1sz == h2sz && hclist_contains(h1, h1sz, h2, h2sz) == 1)
 226  226                          rc = 0;
 227  227          }
 228  228  
 229  229          fmd_fmri_topo_rele(thp);
 230      -        if (f1 != NULL)
 231      -                nvlist_free(f1);
 232      -        if (f2 != NULL)
 233      -                nvlist_free(f2);
      230 +        nvlist_free(f1);
      231 +        nvlist_free(f2);
 234  232          return (rc);
 235  233  }
 236  234  
 237  235  int
 238  236  fmd_fmri_contains(nvlist_t *er, nvlist_t *ee)
 239  237  {
 240  238          nvlist_t **erhcl, **eehcl;
 241  239          uint_t erhclsz, eehclsz;
 242  240          nvlist_t *hcsp;
 243  241          uint64_t eroff, eeoff;
↓ open down ↓ 58 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX