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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fm/fmd/common/fmd_case.c
          +++ new/usr/src/cmd/fm/fmd/common/fmd_case.c
↓ open down ↓ 1314 lines elided ↑ open up ↑
1315 1315  static void
1316 1316  fmd_case_destroy_suspects(fmd_case_impl_t *cip)
1317 1317  {
1318 1318          fmd_case_susp_t *cis, *ncis;
1319 1319  
1320 1320          ASSERT(MUTEX_HELD(&cip->ci_lock));
1321 1321  
1322 1322          if (cip->ci_proxy_asru)
1323 1323                  fmd_free(cip->ci_proxy_asru, sizeof (uint8_t) *
1324 1324                      cip->ci_nsuspects);
1325      -        if (cip->ci_diag_de)
1326      -                nvlist_free(cip->ci_diag_de);
     1325 +        nvlist_free(cip->ci_diag_de);
1327 1326          if (cip->ci_diag_asru)
1328 1327                  fmd_free(cip->ci_diag_asru, sizeof (uint8_t) *
1329 1328                      cip->ci_nsuspects);
1330 1329  
1331 1330          for (cis = cip->ci_suspects; cis != NULL; cis = ncis) {
1332 1331                  ncis = cis->cis_next;
1333 1332                  nvlist_free(cis->cis_nvl);
1334 1333                  fmd_free(cis, sizeof (fmd_case_susp_t));
1335 1334          }
1336 1335  
↓ open down ↓ 1087 lines elided ↑ open up ↑
2424 2423  fmd_case_set_injected(fmd_case_t *cp)
2425 2424  {
2426 2425          ((fmd_case_impl_t *)cp)->ci_injected = 1;
2427 2426  }
2428 2427  
2429 2428  void
2430 2429  fmd_case_set_de_fmri(fmd_case_t *cp, nvlist_t *nvl)
2431 2430  {
2432 2431          fmd_case_impl_t *cip = (fmd_case_impl_t *)cp;
2433 2432  
2434      -        if (cip->ci_diag_de)
2435      -                nvlist_free(cip->ci_diag_de);
     2433 +        nvlist_free(cip->ci_diag_de);
2436 2434          cip->ci_diag_de = nvl;
2437 2435  }
2438 2436  
2439 2437  void
2440 2438  fmd_case_setcode(fmd_case_t *cp, char *code)
2441 2439  {
2442 2440          fmd_case_impl_t *cip = (fmd_case_impl_t *)cp;
2443 2441  
2444 2442          cip->ci_code = fmd_strdup(code, FMD_SLEEP);
2445 2443          cip->ci_codelen = cip->ci_code ? strlen(cip->ci_code) + 1 : 0;
↓ open down ↓ 79 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX