Print this page
patch tsoome-feedback

@@ -197,11 +197,10 @@
                         break;
         }
 
         if (nvlist_alloc(&rsrc,  NV_UNIQUE_NAME|NV_UNIQUE_NAME_TYPE, 0) != 0) {
                 for (i = 0; i < n; i++) {
-                        if (hcl[i] != NULL)
                                 nvlist_free(hcl[i]);
                 }
                 fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
         }
 

@@ -209,11 +208,10 @@
             nvlist_add_string(rsrc, FM_FMRI_SCHEME, FM_FMRI_SCHEME_HC) != 0 ||
             nvlist_add_string(rsrc, FM_FMRI_HC_ROOT, "") != 0 ||
             nvlist_add_uint32(rsrc, FM_FMRI_HC_LIST_SZ, n) != 0 ||
             nvlist_add_nvlist_array(rsrc, FM_FMRI_HC_LIST, hcl, n) != 0) {
                 for (i = 0; i < n; i++) {
-                        if (hcl[i] != NULL)
                                 nvlist_free(hcl[i]);
                 }
                 fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
                 nvlist_free(rsrc);
         }

@@ -227,11 +225,10 @@
                 fmd_case_solve(hdl, cp);
                 nvlist_free(fru);
         }
 
         for (i = 0; i < n; i++) {
-                if (hcl[i] != NULL)
                         nvlist_free(hcl[i]);
         }
 
         fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
         nvlist_free(rsrc);

@@ -397,11 +394,10 @@
                 rsrc = gmem_find_dimm_rsc(hdl, dimm->dimm_serial);
                 flt = fmd_nvl_create_fault(hdl, GMEM_FAULT_DIMM_PAGES,
                     GMEM_FLTMAXCONF, NULL, gmem_dimm_fru(dimm), rsrc);
                 fmd_case_add_suspect(hdl, cp, flt);
                 fmd_case_solve(hdl, cp);
-                if (rsrc != NULL)
                         nvlist_free(rsrc);
         }
 }
 
 /*

@@ -433,11 +429,10 @@
                                     NULL, gmem_dimm_fru(dimm), rsrc);
                                 dimm->dimm_flags |= GMEM_F_FAULTING;
                                 gmem_dimm_dirty(hdl, dimm);
                                 fmd_case_add_suspect(hdl, cp, flt);
                                 fmd_case_solve(hdl, cp);
-                                if (rsrc != NULL)
                                         nvlist_free(rsrc);
                                 return;
                         }
                 }
         }

@@ -703,11 +698,10 @@
                         }
                         dimm->dimm_flags |= GMEM_F_FAULTING;
                         gmem_dimm_dirty(hdl, dimm);
                         fmd_case_add_suspect(hdl, dimm->dimm_case.cc_cp, flt);
                         fmd_case_solve(hdl, dimm->dimm_case.cc_cp);
-                        if (rsc != NULL)
                                 nvlist_free(rsc);
                         return;
                 }
                 upos_pairs = i;
                 assert(upos_pairs < 16);