diff options
| author | Jeff Trawick <trawick@apache.org> | 2001-03-31 11:17:13 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2001-03-31 11:17:13 +0000 |
| commit | 02c9fec8b9af32b16416e264ac78cfcd895d3bbe (patch) | |
| tree | 582567ccf6c961f3298f4247c5cc105ef8ca516a /file_io/unix/filepath.c | |
| parent | 57c74276019ceca2d1b9741b76758d4afdd1acd1 (diff) | |
| download | apr-02c9fec8b9af32b16416e264ac78cfcd895d3bbe.tar.gz apr-02c9fec8b9af32b16416e264ac78cfcd895d3bbe.zip | |
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)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61411 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/unix/filepath.c')
| -rw-r--r-- | file_io/unix/filepath.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/file_io/unix/filepath.c b/file_io/unix/filepath.c index 66df39565..9fdc77fa0 100644 --- a/file_io/unix/filepath.c +++ b/file_io/unix/filepath.c @@ -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 @@ APR_DECLARE(apr_status_t) apr_filepath_get(char **defpath, apr_pool_t *p) } -/* 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) { @@ -88,10 +85,9 @@ APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p) 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 @@ APR_DECLARE(apr_status_t) apr_filepath_parse_root(const char **rootpath, return APR_ERELATIVE; } - APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, const char *rootpath, const char *addpath, @@ -314,4 +309,4 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, *newpath = apr_pstrdup(p, path); return (newpath ? APR_SUCCESS : APR_ENOMEM); -}
\ No newline at end of file +} |