6 files changed, 18 insertions, 24 deletions

diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index 147fce2b98a3..46ef2ba06fd9 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -76,10 +76,9 @@ strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 5aae7f9dc0bc..1a6e818435be 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -77,10 +77,9 @@ strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index 6cbe76abae99..f9658921d829 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -76,10 +76,9 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index a8e37364101b..8bcc2a4f3531 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -74,10 +74,9 @@ strtoul(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 0e80b0d51295..2a454b9c02e1 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -74,10 +74,9 @@ strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index 91d5d07ea4c8..c81b9d1ef7e3 100644
--- a/lib/libc/stdlib/strtoumax.c
+++ b/lib/libc/stdlib/strtoumax.c
@@ -74,10 +74,9 @@ strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if ((base == 0 || base == 16) &&
 	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= 'a' && s[1] <= 'f') ||
-	     (s[1] >= 'A' && s[1] <= 'F') ||
-	     (s[1] >= '0' && s[1] <= '9'))
-	   ) {
+	    ((s[1] >= '0' && s[1] <= '9') ||
+	    (s[1] >= 'A' && s[1] <= 'F') ||
+	    (s[1] >= 'a' && s[1] <= 'f'))) {
 		c = s[1];
 		s += 2;
 		base = 16;