Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/fm/topo/libtopo/common/hc.c
          +++ new/usr/src/lib/fm/topo/libtopo/common/hc.c
↓ open down ↓ 1028 lines elided ↑ open up ↑
1029 1029          if (fac != NULL) {
1030 1030                  if (nvlist_add_nvlist(nf, FM_FMRI_FACILITY, fac) != 0)
1031 1031                          goto hcfmbail;
1032 1032          }
1033 1033  
1034 1034          *out = nf;
1035 1035  
1036 1036          return (0);
1037 1037  
1038 1038  hcfmbail:
1039      -        if (nf != NULL)
1040      -                nvlist_free(nf);
     1039 +        nvlist_free(nf);
1041 1040          for (i = 0; i < npairs; i++)
1042 1041                  nvlist_free(pa[i]);
1043 1042          topo_mod_free(mod, pa, npairs * sizeof (nvlist_t *));
1044 1043  
1045 1044          topo_mod_strfree(mod, serial);
1046 1045          topo_mod_strfree(mod, part);
1047 1046          topo_mod_strfree(mod, rev);
1048 1047          nvlist_free(auth);
1049 1048          nvlist_free(nf);
1050 1049          return (topo_mod_seterrno(mod, EMOD_FMRI_MALFORM));
↓ open down ↓ 119 lines elided ↑ open up ↑
1170 1169                  return (hc_create_seterror(mod,
1171 1170                      hcl, pelems, fmri, EMOD_FMRI_NVL));
1172 1171  
1173 1172          if (nvlist_add_nvlist_array(fmri, FM_FMRI_HC_LIST, hcl, pelems + 1)
1174 1173              != 0)
1175 1174                  return (hc_create_seterror(mod,
1176 1175                      hcl, pelems, fmri, EMOD_FMRI_NVL));
1177 1176  
1178 1177          if (hcl != NULL) {
1179 1178                  for (i = 0; i < pelems + 1; ++i) {
1180      -                        if (hcl[i] != NULL)
1181      -                                nvlist_free(hcl[i]);
     1179 +                        nvlist_free(hcl[i]);
1182 1180                  }
1183 1181                  topo_mod_free(mod, hcl, sizeof (nvlist_t *) * (pelems + 1));
1184 1182          }
1185 1183  
1186 1184          return (fmri);
1187 1185  }
1188 1186  
1189 1187  /*ARGSUSED*/
1190 1188  static int
1191 1189  hc_fmri_create_meth(topo_mod_t *mod, tnode_t *node, topo_version_t version,
↓ open down ↓ 1109 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX