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/cmd/devfsadm/devfsadm.c | |
| 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/cmd/devfsadm/devfsadm.c')
| -rw-r--r-- | usr/src/cmd/devfsadm/devfsadm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c index 2289db2a88..448554a5e0 100644 --- a/usr/src/cmd/devfsadm/devfsadm.c +++ b/usr/src/cmd/devfsadm/devfsadm.c @@ -8290,8 +8290,7 @@ build_event_attributes(char *class, char *subclass, char *node_path, return (nvl); out: - if (nvl) - nvlist_free(nvl); + nvlist_free(nvl); if (dev_name) free(dev_name); @@ -8364,8 +8363,7 @@ process_syseventq() free(tmp->class); if (tmp->subclass != NULL) free(tmp->subclass); - if (tmp->nvl != NULL) - nvlist_free(tmp->nvl); + nvlist_free(tmp->nvl); syseventq_back = syseventq_back->next; if (syseventq_back == NULL) syseventq_front = NULL; |