From 724a328b73087291a6f92c06edd19be0c8b2491f Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Tue, 1 Sep 2020 15:14:26 +0000 Subject: pw: Remove unnecessary errp checks. 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. --- pw/strtounum.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pw/strtounum.c b/pw/strtounum.c index b2fefeb..ae578bd 100644 --- a/pw/strtounum.c +++ b/pw/strtounum.c @@ -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); -- cgit v1.2.3-56-ge451