diff options
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | 2016-02-24 11:58:55 -0500 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-02-27 08:52:10 -0800 |
| commit | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (patch) | |
| tree | 548e8760643ee94860fb29486fbf965675c52a59 /usr/src/lib/libdiskmgt/common/entry.c | |
| parent | d643a855cbd8c4fb4fe966406fa05dff70673597 (diff) | |
| download | illumos-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/lib/libdiskmgt/common/entry.c')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/entry.c | 9 |
1 files changed, 3 insertions, 6 deletions
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); } |