diff options
| -rw-r--r-- | tests/server/getpart.c | 5 | ||||
| -rw-r--r-- | tests/server/sockfilt.c | 2 | ||||
| -rw-r--r-- | tests/server/sws.c | 2 | ||||
| -rw-r--r-- | tests/server/tftpd.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/tests/server/getpart.c b/tests/server/getpart.c index 85bf3ed7b..f426aadbf 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -37,8 +37,9 @@ /* include memdebug.h last */ #include "memdebug.h" -#define EAT_SPACE(ptr) while( ptr && *ptr && isspace((int)*ptr) ) ptr++ -#define EAT_WORD(ptr) while( ptr && *ptr && !isspace((int)*ptr) && ('>' != *ptr)) ptr++ +#define EAT_SPACE(ptr) while( ptr && *ptr && ISSPACE(*ptr) ) ptr++ +#define EAT_WORD(ptr) while( ptr && *ptr && !ISSPACE(*ptr) && \ + ('>' != *ptr)) ptr++ #ifdef DEBUG #define show(x) printf x diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 66c5e4b89..78be45e14 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -119,7 +119,7 @@ static void lograw(unsigned char *buffer, ssize_t len) optr += 2; break; default: - sprintf(optr, "%c", (isgraph(ptr[i]) || ptr[i]==0x20) ?ptr[i]:'.'); + sprintf(optr, "%c", (ISGRAPH(ptr[i]) || ptr[i]==0x20) ?ptr[i]:'.'); width++; optr++; break; diff --git a/tests/server/sws.c b/tests/server/sws.c index 7f9091f4a..fa0561b43 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -242,7 +242,7 @@ int ProcessRequest(struct httprequest *req) ptr++; /* skip the slash */ /* skip all non-numericals following the slash */ - while(*ptr && !isdigit((int)*ptr)) + while(*ptr && !ISDIGIT(*ptr)) ptr++; req->testno = strtol(ptr, &ptr, 10); diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index c234dbf19..7120c152b 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -668,7 +668,7 @@ static int validate_access(struct testcase *test, ptr++; /* skip the slash */ /* skip all non-numericals following the slash */ - while(*ptr && !isdigit((int)*ptr)) + while(*ptr && !ISDIGIT(*ptr)) ptr++; /* get the number */ |