cvs commit: apr/threadproc/win32 proc.c

[wrowe]

wrowe       2002/06/22 23:19:34

  Modified:    misc/win32 misc.c
               test     testnames.c
               threadproc/win32 proc.c
  Log:
    Use apr_ischar() ... especially within apr itself!
  
  Revision  Changes    Path
  1.14      +3 -2      apr/misc/win32/misc.c
  
  Index: misc.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/misc.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- misc.c    13 Mar 2002 20:39:23 -0000      1.13
  +++ misc.c    23 Jun 2002 06:19:34 -0000      1.14
  @@ -57,6 +57,7 @@
   #include "crtdbg.h"
   #include "fileio.h"
   #include "assert.h"
  +#include "apr_lib.h"
   
   apr_oslevel_e apr_os_level = APR_WIN_UNK;
   
  @@ -73,7 +74,7 @@
               static unsigned int servpack = 0;
               char *pservpack;
               if (pservpack = oslev.szCSDVersion) {
  -                while (*pservpack && !isdigit(*pservpack)) {
  +                while (*pservpack && !apr_isdigit(*pservpack)) {
                       pservpack++;
                   }
                   if (*pservpack)
  @@ -129,7 +130,7 @@
           else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
               char *prevision;
               if (prevision = oslev.szCSDVersion) {
  -                while (*prevision && !isupper(*prevision)) {
  +                while (*prevision && !apr_isupper(*prevision)) {
                        prevision++;
                   }
               }
  
  
  
  1.10      +2 -2      apr/test/testnames.c
  
  Index: testnames.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testnames.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- testnames.c       13 Mar 2002 20:39:27 -0000      1.9
  +++ testnames.c       23 Jun 2002 06:19:34 -0000      1.10
  @@ -128,13 +128,13 @@
           if (!fgets(rootpath, 256, stdin))
               exit(0);
           for (eos = strchr(rootpath, '\0'); --eos >= rootpath; )
  -            if (isspace(*eos))
  +            if (apr_isspace(*eos))
                   *eos = '\0';
           fprintf(stdout, "Enter an add path$ ");
           if (!fgets(addpath, 256, stdin))
               exit(0);
           for (eos = strchr(addpath, '\0'); --eos >= addpath; )
  -            if (isspace(*eos))
  +            if (apr_isspace(*eos))
                   *eos = '\0';
           merge_result(rootpath, addpath, 0);
           merge_result(rootpath, addpath, APR_FILEPATH_NOTABOVEROOT);
  
  
  
  1.75      +2 -1      apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- proc.c    4 Jun 2002 04:53:51 -0000       1.74
  +++ proc.c    23 Jun 2002 06:19:34 -0000      1.75
  @@ -60,6 +60,7 @@
   #include "apr_general.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  +#include "apr_lib.h"
   #include <stdlib.h>
   #if APR_HAVE_SIGNAL_H
   #include <signal.h>
  @@ -312,7 +313,7 @@
   {
       const char *ch;
       for (ch = str; *ch; ++ch) {
  -        if (isspace(*ch)) {
  +        if (apr_isspace(*ch)) {
               return ch;
           }
       }