From aab83bb83be7342f6cfccaed8d5fe0b2f404855d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 24 Feb 2016 11:58:55 -0500 Subject: 6659 nvlist_free(NULL) is a no-op Reviewed by: Toomas Soome Reviewed by: Marcel Telka Approved by: Robert Mustacchi --- usr/src/lib/libdiskmgt/common/entry.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'usr/src/lib/libdiskmgt/common/entry.c') diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c index 6acf22f82a..94b36a55be 100644 --- a/usr/src/lib/libdiskmgt/common/entry.c +++ b/usr/src/lib/libdiskmgt/common/entry.c @@ -716,10 +716,8 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) } out: - if (media_attrs) - nvlist_free(media_attrs); - if (slice_attrs) - nvlist_free(slice_attrs); + nvlist_free(media_attrs); + nvlist_free(slice_attrs); if (slices) dm_free_descriptors(slices); @@ -1057,8 +1055,7 @@ dm_inuse(char *dev_name, char **msg, dm_who_type_t who, int *errp) out: if (dname != NULL) free(dname); - if (dev_stats != NULL) - nvlist_free(dev_stats); + nvlist_free(dev_stats); return (found); } -- cgit v1.2.3