diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-22 11:40:29 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-22 11:40:29 +0000 |
| commit | e9faba760cdf80d7dfa110fe0830917ab94668c2 (patch) | |
| tree | a847a0d64968330fdfc51ad27ad00dfe1928876d /usr/src/lib | |
| parent | de1c7a865adeab38b51e5c0db5058e61469b322c (diff) | |
| parent | ce87906fe0d027df0327d283b3423eaf1d3cdda5 (diff) | |
| download | illumos-joyent-e9faba760cdf80d7dfa110fe0830917ab94668c2.tar.gz | |
[illumos-gate merge]
commit ce87906fe0d027df0327d283b3423eaf1d3cdda5
13125 libc: unchecked function return 'nvfree'
commit 64f188a3e276245cf34a8f6ef0189e1cc568b840
13160 loader: Remove NAND and NANDFS support
commit 08a72deac9aaea53335ce22bdbc25eb85de27652
13159 loader: remove common/ufsread.c
commit 7e63fc6f405ee1e58ef05d46f92cb5e1c441e8d7
13176 gptzfsboot: rework stage3 loading
commit d83a2486bd7b53e4a9741736a076e098071b5cbd
13126 libc: variable dereferenced before check 'found'
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libc/port/gen/attrat.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/crypt.c | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr/src/lib/libc/port/gen/attrat.c b/usr/src/lib/libc/port/gen/attrat.c index 89163a3909..d7c7949175 100644 --- a/usr/src/lib/libc/port/gen/attrat.c +++ b/usr/src/lib/libc/port/gen/attrat.c @@ -310,7 +310,7 @@ setattrat(int basefd, xattr_view_t view, const char *name, nvlist_t *request) void libc_nvlist_free(nvlist_t *nvp) { - nvfree(nvp); + (void) nvfree(nvp); } int diff --git a/usr/src/lib/libc/port/gen/crypt.c b/usr/src/lib/libc/port/gen/crypt.c index 5edc9a1deb..812062644f 100644 --- a/usr/src/lib/libc/port/gen/crypt.c +++ b/usr/src/lib/libc/port/gen/crypt.c @@ -208,10 +208,10 @@ cleanup: * either still allowed or not deprecated. * * RETURN VALUES - * Return a pointer to the new salt, the caller is responsible - * for using free(3c) on the return value. - * Returns NULL on error and sets errno to one of: - * EINVAL, ELIBACC, ENOMEM + * Return a pointer to the new salt, the caller is responsible + * for using free(3c) on the return value. + * Returns NULL on error and sets errno to one of: + * EINVAL, ELIBACC, ENOMEM */ char * crypt_gensalt(const char *oldsalt, const struct passwd *userinfo) @@ -570,7 +570,7 @@ getalgbyname(const char *algname, boolean_t *found) *found = B_TRUE; } } - if (!found) { + if (!(*found)) { errno = EINVAL; goto cleanup; } @@ -731,7 +731,7 @@ free_crypt_policy(struct crypt_policy_s *policy) /* * isa_path - prepend the default dir or patch up the $ISA in path - * Caller is responsible for calling free(3c) on the result. + * Caller is responsible for calling free(3c) on the result. */ static char * isa_path(const char *path) @@ -778,10 +778,10 @@ isa_path(const char *path) /*ARGSUSED*/ static char * _unix_crypt_gensalt(char *gsbuffer, - size_t gsbufflen, - const char *oldpuresalt, - const struct passwd *userinfo, - const char *argv[]) + size_t gsbufflen, + const char *oldpuresalt, + const struct passwd *userinfo, + const char *argv[]) { static const char saltchars[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -807,7 +807,7 @@ _unix_crypt_gensalt(char *gsbuffer, /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ |