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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/boot/bootadm/bootadm.c
          +++ new/usr/src/cmd/boot/bootadm/bootadm.c
↓ open down ↓ 3024 lines elided ↑ open up ↑
3025 3025          if (rename(path, path2) != 0) {
3026 3026                  bam_error(RENAME_FAIL, path2, strerror(errno));
3027 3027          }
3028 3028  }
3029 3029  
3030 3030  #define init_walk_args()        bzero(&walk_arg, sizeof (walk_arg))
3031 3031  
3032 3032  static void
3033 3033  clear_walk_args(void)
3034 3034  {
3035      -        if (walk_arg.old_nvlp)
3036      -                nvlist_free(walk_arg.old_nvlp);
3037      -        if (walk_arg.new_nvlp)
3038      -                nvlist_free(walk_arg.new_nvlp);
     3035 +        nvlist_free(walk_arg.old_nvlp);
     3036 +        nvlist_free(walk_arg.new_nvlp);
3039 3037          if (walk_arg.sparcfile)
3040 3038                  (void) fclose(walk_arg.sparcfile);
3041 3039          walk_arg.old_nvlp = NULL;
3042 3040          walk_arg.new_nvlp = NULL;
3043 3041          walk_arg.sparcfile = NULL;
3044 3042  }
3045 3043  
3046 3044  /*
3047 3045   * Returns:
3048 3046   *      0 - no update necessary
↓ open down ↓ 6937 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX