summaryrefslogtreecommitdiff
path: root/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-02-29 12:17:08 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2016-02-29 12:17:08 +0000
commit67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79 (patch)
treea3220c2c4058a61e04dd53a843726a6dd4266a54 /usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
parente5490f12d073ec144d62bc50456b750256cc7c0a (diff)
parentaab83bb83be7342f6cfccaed8d5fe0b2f404855d (diff)
downloadillumos-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/cmd/fm/modules/common/syslog-msgs/syslog.c')
-rw-r--r--usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
index ffa3bac6a8..8f54d3493c 100644
--- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
+++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
@@ -181,8 +181,7 @@ free_notify_prefs(fmd_hdl_t *hdl, nvlist_t **prefs, uint_t nprefs)
int i;
for (i = 0; i < nprefs; i++) {
- if (prefs[i])
- nvlist_free(prefs[i]);
+ nvlist_free(prefs[i]);
}
fmd_hdl_free(hdl, prefs, sizeof (nvlist_t *) * nprefs);