diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-10-10 09:10:46 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-10 09:10:46 -0400 |
| commit | 8733bb6571c33535090fb28bcbe9aa273867168a (patch) | |
| tree | d6a55ba8e3b32ff80c64c797b7a1858a23813f5c /usr/src/lib/libc | |
| parent | 1facf1a43ecaaa0225b7c9d134732d342b607d8d (diff) | |
| parent | d687f445dcb8e0cd6caf81ea59a259f83ac93e2d (diff) | |
| download | illumos-joyent-8733bb6571c33535090fb28bcbe9aa273867168a.tar.gz | |
[illumos-gate merge]
commit d687f445dcb8e0cd6caf81ea59a259f83ac93e2d
15016 find_elf should cope with O_DIRECTORY absence
commit eca0273a3d9494e12a4d82943f1b2d701cde4489
15057 i86pc: redefinition of typedef 'vmm_data_req_t' is a C11 feature
commit bdf9be201fbb95afc4f1d45b03d66d6f0f96c25f
15052 libc: unused label
commit 430fb0518974971393f591123b410c866df1855a
5913 audit_syslog is noisy when it discards messages
commit cd918266dec8ae2553f7a0efd53c52aa90d99a39
2271 CIFS clients fail to authenticate when idmap is using IDMU
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/gen/getutx.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/locale/collate.c | 18 |
2 files changed, 6 insertions, 13 deletions
diff --git a/usr/src/lib/libc/port/gen/getutx.c b/usr/src/lib/libc/port/gen/getutx.c index 5ccd88e55d..71b8364600 100644 --- a/usr/src/lib/libc/port/gen/getutx.c +++ b/usr/src/lib/libc/port/gen/getutx.c @@ -877,7 +877,6 @@ updwtmpx(const char *filex, struct utmpx *utx) utmpx_api2frec(utx, &futx); (void) write(wfdx, &futx, sizeof (futx)); -done: (void) close(wfdx); } diff --git a/usr/src/lib/libc/port/locale/collate.c b/usr/src/lib/libc/port/locale/collate.c index a8d7bf60d5..cf480c913b 100644 --- a/usr/src/lib/libc/port/locale/collate.c +++ b/usr/src/lib/libc/port/locale/collate.c @@ -380,7 +380,7 @@ _collate_wxfrm(const struct lc_collate *lcc, const wchar_t *src, wchar_t *xf, wchar_t *tr = NULL; int direc; int pass; - const int32_t *state; + const int32_t *state; size_t want = 0; size_t need = 0; int ndir = lcc->lc_directive_count; @@ -470,14 +470,11 @@ _collate_wxfrm(const struct lc_collate *lcc, const wchar_t *src, wchar_t *xf, } } -end: - if (tr) - free(tr); + free(tr); return (need); fail: - if (tr) - free(tr); + free(tr); return ((size_t)(-1)); } @@ -531,7 +528,7 @@ _collate_sxfrm(const wchar_t *src, char *xf, size_t room, locale_t loc) wchar_t *tr = NULL; int direc; int pass; - const int32_t *state; + const int32_t *state; size_t want = 0; size_t need = 0; int b; @@ -640,13 +637,10 @@ _collate_sxfrm(const wchar_t *src, char *xf, size_t room, locale_t loc) } } -end: - if (tr) - free(tr); + free(tr); return (need); fail: - if (tr) - free(tr); + free(tr); return ((size_t)(-1)); } |