You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/06/23 08:16:05 UTC
cvs commit: httpd-2.0/server/mpm/winnt nt_eventlog.c
wrowe 2002/06/22 23:16:05
Modified: test cls.c
server/mpm/winnt nt_eventlog.c
Log:
Adapt to use apr_ischar()
Revision Changes Path
1.2 +6 -6 httpd-2.0/test/cls.c
Index: cls.c
===================================================================
RCS file: /home/cvs/httpd-2.0/test/cls.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cls.c 24 Aug 1999 06:46:01 -0000 1.1
+++ cls.c 23 Jun 2002 06:16:05 -0000 1.2
@@ -22,19 +22,19 @@
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 @@
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);
1.3 +2 -2 httpd-2.0/server/mpm/winnt/nt_eventlog.c
Index: nt_eventlog.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/nt_eventlog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nt_eventlog.c 14 Mar 2002 04:43:11 -0000 1.2
+++ nt_eventlog.c 23 Jun 2002 06:16:05 -0000 1.3
@@ -111,13 +111,13 @@
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';