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/libipp/libipp.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/lib/libipp/libipp.c')
| -rw-r--r-- | usr/src/lib/libipp/libipp.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/usr/src/lib/libipp/libipp.c b/usr/src/lib/libipp/libipp.c index 94a5dc3a45..0b931a10e8 100644 --- a/usr/src/lib/libipp/libipp.c +++ b/usr/src/lib/libipp/libipp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -225,8 +223,7 @@ ipp_action_destroy( return (dispatch(&nvlp, NULL, NULL)); failed: - if (nvlp != NULL) - nvlist_free(nvlp); + nvlist_free(nvlp); errno = rc; return (-1); } @@ -336,8 +333,7 @@ ipp_action_info( return (dispatch(&nvlp, fn, arg)); failed: - if (nvlp != NULL) - nvlist_free(nvlp); + nvlist_free(nvlp); errno = rc; return (-1); } @@ -389,8 +385,7 @@ ipp_action_mod( return (dispatch(&nvlp, string_callback, (void *)modnamep)); failed: - if (nvlp != NULL) - nvlist_free(nvlp); + nvlist_free(nvlp); errno = rc; return (-1); } @@ -446,8 +441,7 @@ ipp_list_mods( return (rc); failed: - if (nvlp != NULL) - nvlist_free(nvlp); + nvlist_free(nvlp); errno = rc; return (-1); } @@ -510,8 +504,7 @@ ipp_mod_list_actions( return (rc); failed: - if (nvlp != NULL) - nvlist_free(nvlp); + nvlist_free(nvlp); errno = rc; return (-1); } |