Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/beadm/beadm.c
          +++ new/usr/src/cmd/beadm/beadm.c
↓ open down ↓ 938 lines elided ↑ open up ↑
 939  939                              "%s.\n"), snap_name);
 940  940                  else
 941  941                          (void) fprintf(stderr, _("Unable to create %s.\n"),
 942  942                              nbe_name);
 943  943                  (void) fprintf(stderr, "%s\n", be_err_to_str(err));
 944  944          }
 945  945  
 946  946  out:
 947  947          nvlist_free(be_attrs);
 948  948  out2:
 949      -        if (zfs_props != NULL)
 950      -                nvlist_free(zfs_props);
      949 +        nvlist_free(zfs_props);
 951  950  
 952  951          return (err);
 953  952  }
 954  953  
 955  954  static int
 956  955  be_do_destroy(int argc, char **argv)
 957  956  {
 958  957          nvlist_t        *be_attrs;
 959  958          boolean_t       is_snap = B_FALSE;
 960  959          boolean_t       suppress_prompt = B_FALSE;
↓ open down ↓ 616 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX