d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pw: Remove unnecessary errp checks.

Browse Source 
The caller-supplied pointer is unconditionally dereferenced at the
beginning of the function, so there is no point in comparing it with
NULL thereafter.

Reported by:	Coverity
MFC after:	1 week
Sponsored by:	NetApp, Inc.
Sponsored by:	Klara, Inc.
This commit is contained in:
Mark Johnston 2020-09-01 15:14:26 +00:00
parent 79c8ad8368
commit 45bfd3158c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/pw/strtounum.c
View File

@ -44,28 +44,24 @@ strtounum(const char * __restrict np, uintmax_t minval, uintmax_t maxval,
*errpp = NULL;
if (minval > maxval) {
errno = EINVAL;
if (errpp != NULL)
*errpp = "invalid";
*errpp = "invalid";
return (0);
}
errno = 0;
ret = strtoumax(np, &endp, 10);
if (endp == np || *endp != '\0') {
errno = EINVAL;
if (errpp != NULL)
*errpp = "invalid";
*errpp = "invalid";
return (0);
}
if (ret < minval) {
errno = ERANGE;
if (errpp != NULL)
*errpp = "too small";
*errpp = "too small";
return (0);
}
if (errno == ERANGE || ret > maxval) {
errno = ERANGE;
if (errpp != NULL)
*errpp = "too large";
*errpp = "too large";
return (0);
}
return (ret);