patch tsoome-feedback

*** 21,32 ****
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
- #pragma ident   "%Z%%M% %I%     %E% SMI"
- 
  /*
   * Routines for traversing and packing/unpacking the handle
   * returned from ri_init.
   */
  
--- 21,30 ----
*** 80,90 ****
  {
          ri_dev_t        *dev;
  
          assert(ap != NULL);
  
-         if (ap->conf_props != NULL)
                  nvlist_free(ap->conf_props);
  
          while ((dev = ap->cpus) != NULL) {
                  ap->cpus = dev->next;
                  ri_dev_free(dev);
--- 78,87 ----
*** 118,130 ****
  void
  ri_client_free(ri_client_t *client)
  {
          assert(client != NULL);
  
-         if (client->usg_props != NULL)
                  nvlist_free(client->usg_props);
-         if (client->v_props != NULL)
                  nvlist_free(client->v_props);
          free(client);
  }
  
  /*
--- 115,125 ----
*** 194,204 ****
  
          return (RI_SUCCESS);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (RI_FAILURE);
  }
  
--- 189,198 ----
*** 248,258 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 242,251 ----
*** 302,312 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 295,304 ----
*** 357,367 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 349,358 ----
*** 422,432 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 413,422 ----
*** 468,478 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 458,467 ----
*** 513,523 ****
  
          return (0);
  
  fail:
          s_free(buf);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 502,511 ----
*** 615,625 ****
  
          return (0);
  
  fail:
          free(ri_hdl);
-         if (nvl != NULL)
                  nvlist_free(nvl);
  
          return (-1);
  }
  
--- 603,612 ----
*** 669,679 ****
          *aps = aplist;
  
          return (0);
  
  fail:
-         if (nvl != NULL)
                  nvlist_free(nvl);
          if (aplist != NULL) {
                  while ((tmp = aplist) != NULL) {
                          aplist = aplist->next;
                          ri_ap_free(tmp);
--- 656,665 ----
*** 727,737 ****
          *devs = devlist;
  
          return (0);
  
  fail:
-         if (nvl != NULL)
                  nvlist_free(nvl);
          if (devlist != NULL) {
                  while ((tmp = devlist) != NULL) {
                          devlist = devlist->next;
                          ri_dev_free(tmp);
--- 713,722 ----
*** 787,797 ****
          *clients = client_list;
  
          return (0);
  
  fail:
-         if (nvl != NULL)
                  nvlist_free(nvl);
          if (client_list != NULL) {
                  while ((tmp = client_list) != NULL) {
                          client_list = client_list->next;
                          ri_client_free(tmp);
--- 772,781 ----