Revert "Set chpass to 755 too"

[pw-darwin.git] / pw / strtounum.c

diff --git a/pw/strtounum.c b/pw/strtounum.c
index be572764b60c7e7ebb2573689be2ffb774db6945..ae578bdeaeba22da613b74e50bda0acc747e3052 100644 (file)
--- a/pw/strtounum.c
+++ b/pw/strtounum.c
@@ -41,30 +41,27 @@ strtounum(const char * __restrict np, uintmax_t minval, uintmax_t maxval,
        char *endp;
        uintmax_t ret;
 
+       *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);