summaryrefslogtreecommitdiff
path: root/usr/src/cmd/zpool/zpool_main.c
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>2016-02-24 11:58:55 -0500
committerRobert Mustacchi <rm@joyent.com>2016-02-27 08:52:10 -0800
commitaab83bb83be7342f6cfccaed8d5fe0b2f404855d (patch)
tree548e8760643ee94860fb29486fbf965675c52a59 /usr/src/cmd/zpool/zpool_main.c
parentd643a855cbd8c4fb4fe966406fa05dff70673597 (diff)
downloadillumos-joyent-aab83bb83be7342f6cfccaed8d5fe0b2f404855d.tar.gz
6659 nvlist_free(NULL) is a no-op
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Marcel Telka <marcel@telka.sk> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/zpool/zpool_main.c')
-rw-r--r--usr/src/cmd/zpool/zpool_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
index a2af33be8c..cef01c1b0b 100644
--- a/usr/src/cmd/zpool/zpool_main.c
+++ b/usr/src/cmd/zpool/zpool_main.c
@@ -3241,8 +3241,7 @@ zpool_do_split(int argc, char **argv)
if (add_prop_list(
zpool_prop_to_name(ZPOOL_PROP_ALTROOT), optarg,
&props, B_TRUE) != 0) {
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
usage(B_FALSE);
}
break;
@@ -3255,8 +3254,7 @@ zpool_do_split(int argc, char **argv)
propval++;
if (add_prop_list(optarg, propval,
&props, B_TRUE) != 0) {
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
usage(B_FALSE);
}
} else {