From cvs-return-2072-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sat Sep 01 05:13:10 2001
Return-Path: <cvs-return-2072-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 19927 invoked by uid 500); 1 Sep 2001 05:13:09 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 19916 invoked from network); 1 Sep 2001 05:13:09 -0000
Date: 1 Sep 2001 05:11:46 -0000
Message-ID: <20010901051146.99784.qmail@icarus.apache.org>
From: bjh@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/file_io/win32 filepath.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bjh         01/08/31 22:11:46

  Modified:    file_io/win32 filepath.c
  Log:
  Fix a few warnings.
  - Several 'incompatible pointer type' warnings due to missing const's.
  - Implicit declarations of strchr, strncmp & toupper.
  
  Revision  Changes    Path
  1.12      +6 -4      apr/file_io/win32/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- filepath.c	2001/08/30 15:44:09	1.11
  +++ filepath.c	2001/09/01 05:11:46	1.12
  @@ -55,6 +55,8 @@
   #include "apr.h"
   #include "fileio.h"
   #include "apr_strings.h"
  +#include <string.h>
  +#include <ctype.h>
   
   #ifdef NETWARE
   #include <unistd.h>
  @@ -331,8 +333,8 @@
                                                apr_pool_t *p)
   {
       char path[APR_PATH_MAX]; /* isn't null term */
  -    char *baseroot = NULL;
  -    char *addroot;
  +    const char *baseroot = NULL;
  +    const char *addroot;
       apr_size_t rootlen; /* the length of the root portion of path, d:/ is 3 */
       apr_size_t baselen; /* the length of basepath (excluding baseroot) */
       apr_size_t keptlen; /* the length of the retained basepath (incl root) */
  @@ -716,8 +718,8 @@
           {
   #ifndef NETWARE
               if (fixunc) {
  -                char *testpath = path;
  -                char *testroot;
  +                const char *testpath = path;
  +                const char *testroot;
                   apr_status_t testtype;
                   apr_size_t i = (addpath[segend] != '\0');