diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
commit | 67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79 (patch) | |
tree | a3220c2c4058a61e04dd53a843726a6dd4266a54 /usr/src/lib/libscf | |
parent | e5490f12d073ec144d62bc50456b750256cc7c0a (diff) | |
parent | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (diff) | |
download | illumos-joyent-67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79.tar.gz |
[illumos-gate merge]
commit aab83bb83be7342f6cfccaed8d5fe0b2f404855d
6659 nvlist_free(NULL) is a no-op
commit d643a855cbd8c4fb4fe966406fa05dff70673597
6674 sys/isa_defs.h shouldn't unconditionally define _ILP32
commit bcf23f43dc1b73080eeded927585ee86feab40a7
6596 Macro redefined in strtolctype.h
Diffstat (limited to 'usr/src/lib/libscf')
-rw-r--r-- | usr/src/lib/libscf/common/notify_params.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/lib/libscf/common/notify_params.c b/usr/src/lib/libscf/common/notify_params.c index 3e41d19f8f..963916514d 100644 --- a/usr/src/lib/libscf/common/notify_params.c +++ b/usr/src/lib/libscf/common/notify_params.c @@ -1770,8 +1770,7 @@ _scf_get_fma_notify_params(const char *class, nvlist_t *nvl, int getsource) r = SCF_SUCCESS; cleanup: - if (params) - nvlist_free(params); + nvlist_free(params); scf_pg_destroy(pg); scf_instance_destroy(i); scf_handle_destroy(h); |