apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/file_io/unix filepath.c
Date Sat, 31 Mar 2001 11:17:14 GMT
trawick     01/03/31 03:17:14

  Modified:    file_io/unix filepath.c
  Log:
  get filepath.c to compile on Linux/FreeBSD/etc. by dropping the
  include of direct.h (a Windows thing as far as google can tell me)
  
  fix a warning by changing the name of apr_filepath_parse_root() to
  match the prototype in apr_file_info.h
  
  other trivial tweaks (spelling, adding '\n' to last line)
  
  Revision  Changes    Path
  1.2       +6 -11     apr/file_io/unix/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filepath.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filepath.c	2001/03/31 06:22:38	1.1
  +++ filepath.c	2001/03/31 11:17:13	1.2
  @@ -60,10 +60,7 @@
   #include <unistd.h>
   #endif
   
  -#include <direct.h>
  -
  -
  -/* Any OS that requires/refuses trailing slashes should be delt with here.
  +/* Any OS that requires/refuses trailing slashes should be dealt with here.
    */
   APR_DECLARE(apr_status_t) apr_filepath_get(char **defpath, apr_pool_t *p)
   {
  @@ -79,7 +76,7 @@
   }    
   
   
  -/* Any OS that requires/refuses trailing slashes should be delt with here
  +/* Any OS that requires/refuses trailing slashes should be dealt with here
    */
   APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p)
   {
  @@ -87,11 +84,10 @@
           return errno;
       return APR_SUCCESS;
   }    
  -
   
  -APR_DECLARE(apr_status_t) apr_filepath_parse_root(const char **rootpath, 
  -                                                  const char **inpath,
  -                                                  apr_pool_t *p)
  +APR_DECLARE(apr_status_t) apr_filepath_root(const char **rootpath, 
  +                                            const char **inpath,
  +                                            apr_pool_t *p)
   {
       if (**inpath == '/') 
       {
  @@ -103,7 +99,6 @@
       return APR_ERELATIVE;
   }
   
  -
   APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, 
                                                const char *rootpath, 
                                                const char *addpath, 
  @@ -314,4 +309,4 @@
   
       *newpath = apr_pstrdup(p, path);
       return (newpath ? APR_SUCCESS : APR_ENOMEM);
  -}
  \ No newline at end of file
  +}
  
  
  

Mime
View raw message