Adapt to use apr_ischar()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95860 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c
index a647494b4a1e34cf9c51f3fc830848a551da14e7..24e146109f307a5f513044141776b8cf50925aab 100644 (file)
--- a/server/mpm/winnt/nt_eventlog.c
+++ b/server/mpm/winnt/nt_eventlog.c
@@ -111,13 +111,13 @@ static DWORD WINAPI service_stderr_thread(LPVOID hPipe)
 
     while (ReadFile(hPipeRead, errmsg, 1, &errres, NULL) && (errres == 1))
     {
-        if ((errmsg > errbuf) || !isspace(*errmsg))
+        if ((errmsg > errbuf) || !apr_isspace(*errmsg))
         {
             ++errmsg;
             if ((*(errmsg - 1) == '\n') 
                     || (errmsg >= errbuf + sizeof(errbuf) - 1))
             {
-                while ((errmsg > errbuf) && isspace(*(errmsg - 1))) {
+                while ((errmsg > errbuf) && apr_isspace(*(errmsg - 1))) {
                     --errmsg;
                 }
                 *errmsg = '\0';

diff --git a/test/cls.c b/test/cls.c
index 91114a784ca4aadcc5c8b0ffdf7ad90c210c012d..e5910d885aae795182e31477f28d2577dfb4b19a 100644 (file)
--- a/test/cls.c
+++ b/test/cls.c
@@ -22,19 +22,19 @@ static int checkmask(const char *data, const char *mask)
        ch = mask[i];
        d = data[i];
        if (ch == '@') {
-           if (!isupper(d))
+           if (!apr_isupper(d))
                return 0;
        }
        else if (ch == '$') {
-           if (!islower(d))
+           if (!apr_islower(d))
                return 0;
        }
        else if (ch == '#') {
-           if (!isdigit(d))
+           if (!apr_isdigit(d))
                return 0;
        }
        else if (ch == '&') {
-           if (!isxdigit(d))
+           if (!apr_isxdigit(d))
                return 0;
        }
        else if (ch != d)
@@ -58,9 +58,9 @@ static int hex2sec(const char *x)
     for (i = 0, j = 0; i < 8; i++) {
        ch = x[i];
        j <<= 4;
-       if (isdigit(ch))
+       if (apr_isdigit(ch))
            j |= ch - '0';
-       else if (isupper(ch))
+       else if (apr_isupper(ch))
            j |= ch - ('A' - 10);
        else
            j |= ch - ('a' - 10);