diff options
author | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-08-06 15:48:40 +0000 |
---|---|---|
committer | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-08-06 15:48:40 +0000 |
commit | ea60a4eb8cbd4937cb076627287c91945cf3446a (patch) | |
tree | 20a8679374692316a86b7e9a652dea43c4de1ce9 /strings | |
parent | 975908acee67064c97e1346dbb5dedeed2578b50 (diff) | |
download | libapr-ea60a4eb8cbd4937cb076627287c91945cf3446a.tar.gz |
Use apr_is*() character test macros to avoid warnings about signed
characters.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60485 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'strings')
-rw-r--r-- | strings/apr_strnatcmp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/strings/apr_strnatcmp.c b/strings/apr_strnatcmp.c index f1057fde6..1070ffdab 100644 --- a/strings/apr_strnatcmp.c +++ b/strings/apr_strnatcmp.c @@ -45,11 +45,11 @@ compare_right(char const *a, char const *b) both numbers to know that they have the same magnitude, so we remember it in BIAS. */ for (;; a++, b++) { - if (!isdigit(*a) && !isdigit(*b)) + if (!apr_isdigit(*a) && !apr_isdigit(*b)) return bias; - else if (!isdigit(*a)) + else if (!apr_isdigit(*a)) return -1; - else if (!isdigit(*b)) + else if (!apr_isdigit(*b)) return +1; else if (*a < *b) { if (!bias) @@ -71,11 +71,11 @@ compare_left(char const *a, char const *b) /* Compare two left-aligned numbers: the first to have a different value wins. */ for (;; a++, b++) { - if (!isdigit(*a) && !isdigit(*b)) + if (!apr_isdigit(*a) && !apr_isdigit(*b)) return 0; - else if (!isdigit(*a)) + else if (!apr_isdigit(*a)) return -1; - else if (!isdigit(*b)) + else if (!apr_isdigit(*b)) return +1; else if (*a < *b) return -1; @@ -99,14 +99,14 @@ static int strnatcmp0(char const *a, char const *b, int fold_case) ca = a[ai]; cb = b[bi]; /* skip over leading spaces or zeros */ - while (isspace(ca)) + while (apr_isspace(ca)) ca = a[++ai]; - while (isspace(cb)) + while (apr_isspace(cb)) cb = b[++bi]; /* process run of digits */ - if (isdigit(ca) && isdigit(cb)) { + if (apr_isdigit(ca) && apr_isdigit(cb)) { fractional = (ca == '0' || cb == '0'); if (fractional) { |