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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/librcm/librcm.c
          +++ new/usr/src/lib/librcm/librcm.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  27      -
  28   26  #include "librcm_impl.h"
  29   27  #include "librcm_event.h"
  30   28  
  31   29  #ifdef  DEBUG
  32   30  static int rcm_debug = 1;
  33   31  #define dprintf(args) if (rcm_debug) (void) fprintf args
  34   32  #else
  35   33  #define dprintf(args) /* nothing */
  36   34  #endif  /* DEBUG */
  37   35  
↓ open down ↓ 500 lines elided ↑ open up ↑
 538  536   * RCM helper functions exposed to librcm callers.
 539  537   */
 540  538  
 541  539  /* Free linked list of registration info */
 542  540  void
 543  541  rcm_free_info(rcm_info_t *info)
 544  542  {
 545  543          while (info) {
 546  544                  rcm_info_t *tmp = info->next;
 547  545  
 548      -                if (info->info)
 549      -                        nvlist_free(info->info);
      546 +                nvlist_free(info->info);
 550  547                  free(info);
 551  548  
 552  549                  info = tmp;
 553  550          }
 554  551  }
 555  552  
 556  553  /* return the next tuple in the info structure */
 557  554  rcm_info_tuple_t *
 558  555  rcm_info_next(rcm_info_t *info, rcm_info_tuple_t *tuple)
 559  556  {
↓ open down ↓ 693 lines elided ↑ open up ↑
1253 1250                          errno = daemon_errno;
1254 1251                          error = RCM_FAILURE;
1255 1252                  } else {
1256 1253                          error = daemon_errno;
1257 1254                  }
1258 1255          }
1259 1256  
1260 1257  out:
1261 1258          if (nvl_packed)
1262 1259                  free(nvl_packed);
1263      -        if (ret)
1264      -                nvlist_free(ret);
     1260 +        nvlist_free(ret);
1265 1261          dprintf((stderr, "daemon call is done. error = %d, errno = %s\n", error,
1266 1262              strerror(errno)));
1267 1263          return (error);
1268 1264  }
1269 1265  
1270 1266  /*
1271 1267   * Extract registration info from event data.
1272 1268   * Return 0 on success and -1 on failure.
1273 1269   */
1274 1270  static int
↓ open down ↓ 168 lines elided ↑ open up ↑
1443 1439          if (buf)
1444 1440                  free(buf);
1445 1441  
1446 1442          /* Free the unpacked version of the nvlist and return the packed list */
1447 1443          nvlist_free(nvl);
1448 1444          return (0);
1449 1445  
1450 1446  fail:
1451 1447          if (buf)
1452 1448                  free(buf);
1453      -        if (nvl)
1454      -                nvlist_free(nvl);
     1449 +        nvlist_free(nvl);
1455 1450          if (*nvl_packed)
1456 1451                  free(*nvl_packed);
1457 1452          *nvl_packed = NULL;
1458 1453          *nvl_size = 0;
1459 1454          return (-1);
1460 1455  }
1461 1456  
1462 1457  /* check if rcm_daemon is up and running */
1463 1458  static int
1464 1459  rcm_daemon_is_alive()
↓ open down ↓ 87 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX