diff options
| -rw-r--r-- | ext/standard/strnatcmp.c | 18 | ||||
| -rw-r--r-- | ext/standard/tests/strings/strnatcasecmp_variation1.phpt | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index 7b3826b5be..de6f727343 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -109,23 +109,7 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len short leading = 1; if (a_len == 0 || b_len == 0) { - result = 0; - - if (a_len > b_len) { - if (a_len - b_len <= INT_MAX) { - result = (int)(a_len - b_len); - } else { - result = 1; - } - } else { - if (b_len - a_len <= (size_t)(-INT_MIN)) { - result = -(int)(b_len - a_len); - } else { - result = -1; - } - } - - return result; + return (a_len == b_len ? 0 : (a_len > b_len ? 1 : -1)); } ap = a; diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index fb0fb79ae5..e74f6b73e9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -48,8 +48,8 @@ str_dump($a, $b); --EXPECT-- *** Testing strnatcasecmp() : variation *** int(1) -int(6) -int(-2) +int(1) +int(-1) int(-1) int(0) int(0) |