summaryrefslogtreecommitdiff
path: root/usr/src/lib/libcontract/common/libcontract.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/lib/libcontract/common/libcontract.c
parentd643a855cbd8c4fb4fe966406fa05dff70673597 (diff)
downloadillumos-gate-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/libcontract/common/libcontract.c')
-rw-r--r--usr/src/lib/libcontract/common/libcontract.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr/src/lib/libcontract/common/libcontract.c b/usr/src/lib/libcontract/common/libcontract.c
index 2c8afda094..3a3bf4a76a 100644
--- a/usr/src/lib/libcontract/common/libcontract.c
+++ b/usr/src/lib/libcontract/common/libcontract.c
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/ctfs.h>
#include <sys/contract.h>
#include <string.h>
@@ -467,8 +465,7 @@ errout:
if (event_buffer)
free(event_buffer);
if (info) {
- if (info->nvl)
- nvlist_free(info->nvl);
+ nvlist_free(info->nvl);
free(info);
}
return (error);
@@ -507,8 +504,7 @@ ct_event_free(ct_evthdl_t evthdl)
{
struct ctlib_event_info *info = evthdl;
- if (info->nvl)
- nvlist_free(info->nvl);
+ nvlist_free(info->nvl);
free(info);
}