apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/strings apr_strnatcmp.c
Date Thu, 13 Dec 2001 17:26:15 GMT
wrowe       01/12/13 09:26:15

  Modified:    test     testucs.c
               file_io/os2 filesys.c
               file_io/win32 filepath.c
               strings  apr_strnatcmp.c
  Log:
    When in Rome... or better put... eat our own dogfood.
  
  Revision  Changes    Path
  1.3       +2 -2      apr/test/testucs.c
  
  Index: testucs.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testucs.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testucs.c	2000/11/15 11:52:36	1.2
  +++ testucs.c	2001/12/13 17:26:15	1.3
  @@ -148,11 +148,11 @@
       struct testval s;
       memset (&s, 0, sizeof(s));
   
  -    if (argc < 2 || tolower(*argv[1]) != 'w') {
  +    if (argc < 2 || apr_tolower(*argv[1]) != 'w') {
           printf ("\n\nTesting Narrow Char Ranges\n");
           test_nrange(&s);
       }
  -    if (argc < 2 || tolower(*argv[1]) != 'n') {
  +    if (argc < 2 || apr_tolower(*argv[1]) != 'n') {
           printf ("\n\nTesting Wide Char Ranges\n");
           test_wrange(&s);
       }
  
  
  
  1.4       +5 -4      apr/file_io/os2/filesys.c
  
  Index: filesys.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filesys.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filesys.c	2001/09/09 06:03:05	1.3
  +++ filesys.c	2001/12/13 17:26:15	1.4
  @@ -55,6 +55,7 @@
   #include "apr.h"
   #include "fileio.h"
   #include "apr_strings.h"
  +#include "apr_lib.h"
   #include <ctype.h>
   
   /* OS/2 Exceptions:
  @@ -91,7 +92,7 @@
   
   apr_status_t filepath_root_test(char *path, apr_pool_t *p)
   {
  -    char drive = toupper(path[0]);
  +    char drive = apr_toupper(path[0]);
   
       if (drive >= 'A' && drive <= 'Z' && path[1] == ':' &&
IS_SLASH(path[2]))
           return APR_SUCCESS;
  @@ -112,7 +113,7 @@
       path[1] = ':';
       path[2] = '/';
   
  -    rc = DosQueryCurrentDir(toupper(drive) - 'A', path+3, &bufsize);
  +    rc = DosQueryCurrentDir(apr_toupper(drive) - 'A', path+3, &bufsize);
   
       if (rc) {
           return APR_FROM_OS_ERROR(rc);
  @@ -136,7 +137,7 @@
   
       strcpy(path, root);
       if (path[1] == ':')
  -        path[0] = toupper(path[0]);
  +        path[0] = apr_toupper(path[0]);
       *rootpath = apr_pstrdup(p, path);
       return APR_SUCCESS;
   }
  @@ -175,7 +176,7 @@
       ULONG rv = 0;
   
       if (path[1] == ':')
  -        rv = DosSetDefaultDisk(toupper(path[0]) - '@');
  +        rv = DosSetDefaultDisk(apr_toupper(path[0]) - '@');
   
       if (rv == 0)
           rv = DosSetCurrentDir(path);
  
  
  
  1.20      +2 -1      apr/file_io/win32/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- filepath.c	2001/11/18 02:25:46	1.19
  +++ filepath.c	2001/12/13 17:26:15	1.20
  @@ -55,6 +55,7 @@
   #include "apr.h"
   #include "fileio.h"
   #include "apr_strings.h"
  +#include "apr_lib.h"
   #include <string.h>
   #include <ctype.h>
   
  @@ -324,7 +325,7 @@
           newpath[2] = seperator[0];
           newpath[3] = '\0';
           if (flags & APR_FILEPATH_TRUENAME) {
  -            newpath[0] = toupper(newpath[0]);
  +            newpath[0] = apr_toupper(newpath[0]);
               rv = filepath_root_test(newpath, p);
               if (rv)
                   return rv;
  
  
  
  1.7       +2 -2      apr/strings/apr_strnatcmp.c
  
  Index: apr_strnatcmp.c
  ===================================================================
  RCS file: /home/cvs/apr/strings/apr_strnatcmp.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_strnatcmp.c	2001/01/18 20:07:36	1.6
  +++ apr_strnatcmp.c	2001/12/13 17:26:15	1.7
  @@ -125,8 +125,8 @@
   	  }
   
   	  if (fold_case) {
  -	       ca = toupper(ca);
  -	       cb = toupper(cb);
  +	       ca = apr_toupper(ca);
  +	       cb = apr_toupper(cb);
   	  }
   	  
   	  if (ca < cb)
  
  
  

Mime
View raw message