Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
          +++ new/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
↓ open down ↓ 66 lines elided ↑ open up ↑
  67   67   *      - propery lookup
  68   68   *
  69   69   * These routines may only be called by consumers of a topology snapshot.
  70   70   * They may not be called by libtopo enumerator or method modules.
  71   71   */
  72   72  
  73   73  /*ARGSUSED*/
  74   74  static int
  75   75  set_error(topo_hdl_t *thp, int err, int *errp, char *method, nvlist_t *nvlp)
  76   76  {
  77      -        if (nvlp != NULL)
  78      -                nvlist_free(nvlp);
       77 +        nvlist_free(nvlp);
  79   78  
  80   79          topo_dprintf(thp, TOPO_DBG_ERR, "%s failed: %s\n", method,
  81   80              topo_strerror(err));
  82   81  
  83   82          *errp = err;
  84   83          return (-1);
  85   84  }
  86   85  
  87   86  /*ARGSUSED*/
  88   87  static nvlist_t *
  89   88  set_nverror(topo_hdl_t *thp, int err, int *errp, char *method, nvlist_t *nvlp)
  90   89  {
  91      -        if (nvlp != NULL)
  92      -                nvlist_free(nvlp);
       90 +        nvlist_free(nvlp);
  93   91  
  94   92          topo_dprintf(thp, TOPO_DBG_ERR, "%s failed: %s\n", method,
  95   93              topo_strerror(err));
  96   94  
  97   95          *errp = err;
  98   96          return (NULL);
  99   97  }
 100   98  
 101   99  int
 102  100  topo_fmri_nvl2str(topo_hdl_t *thp, nvlist_t *fmri, char **fmristr, int *err)
↓ open down ↓ 483 lines elided ↑ open up ↑
 586  584          if (rv != 0)
 587  585                  return (set_error(thp, ETOPO_FMRI_NVL, err,
 588  586                      TOPO_METH_PROP_SET, in));
 589  587  
 590  588          rv = topo_method_invoke(rnode, TOPO_METH_PROP_SET,
 591  589              TOPO_METH_PROP_SET_VERSION, in, &out, err);
 592  590  
 593  591          nvlist_free(in);
 594  592  
 595  593          /* no return values */
 596      -        if (out != NULL)
 597      -                nvlist_free(out);
      594 +        nvlist_free(out);
 598  595  
 599  596          if (rv)
 600  597                  return (-1);
 601  598  
 602  599          return (0);
 603  600  
 604  601  }
 605  602  
 606  603  int
 607  604  topo_fmri_getpgrp(topo_hdl_t *thp, nvlist_t *rsrc, const char *pgname,
↓ open down ↓ 455 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX