diff options
| author | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-01-24 04:28:09 +0000 |
|---|---|---|
| committer | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-01-24 04:28:09 +0000 |
| commit | 9ac28eb1771ca7586ae24d719ede36c45a310ffe (patch) | |
| tree | c4a6edd8a6e2a92a6957e4491ca1c6eb4130a05f /file_io | |
| parent | 55654f633513eb60dd47686f132477a9d7d8c215 (diff) | |
| download | libapr-9ac28eb1771ca7586ae24d719ede36c45a310ffe.tar.gz | |
Change the new_file parameter of apr_file_dup2() so that it is perfectly
clear that it takes an old apr_file_t* object and doesn't create a new
one. This makes the function signatures of apr_file_dup() and
apr_file_dup2() distinct.
Reviewed by: William Rowe
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62819 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
| -rw-r--r-- | file_io/os2/filedup.c | 8 | ||||
| -rw-r--r-- | file_io/unix/filedup.c | 6 | ||||
| -rw-r--r-- | file_io/win32/filedup.c | 16 |
3 files changed, 13 insertions, 17 deletions
diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c index eec3229e6..940657c23 100644 --- a/file_io/os2/filedup.c +++ b/file_io/os2/filedup.c @@ -113,11 +113,7 @@ APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file, apr_file_t *old_fi -APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p) +APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file, apr_file_t *old_file, apr_pool_t *p) { - if (*new_file == NULL) { - return APR_EINVAL; - } - - return file_dup(new_file, old_file, p); + return file_dup(&new_file, old_file, p); } diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c index 7cda84fd3..4b7fb76da 100644 --- a/file_io/unix/filedup.c +++ b/file_io/unix/filedup.c @@ -138,13 +138,13 @@ APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file, } -APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t **new_file, +APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file, apr_file_t *old_file, apr_pool_t *p) { #ifdef NETWARE - return _file_dup(new_file, old_file, p, 1); + return _file_dup(&new_file, old_file, p, 1); #else - return _file_dup(new_file, old_file, p, 2); + return _file_dup(&new_file, old_file, p, 2); #endif } diff --git a/file_io/win32/filedup.c b/file_io/win32/filedup.c index 22a728d8f..c4717d8cc 100644 --- a/file_io/win32/filedup.c +++ b/file_io/win32/filedup.c @@ -94,7 +94,7 @@ APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file, } -APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t **new_file, +APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file, apr_file_t *old_file, apr_pool_t *p) { DWORD stdhandle = -1; @@ -134,17 +134,17 @@ APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t **new_file, FALSE, DUPLICATE_SAME_ACCESS)) { return apr_get_os_error(); } - if ((*new_file)->filehand) { - CloseHandle((*new_file)->filehand); + if (new_file->filehand) { + CloseHandle(new_file->filehand); } newflags = old_file->flags & ~APR_INHERIT; } - (*new_file)->flags = newflags; - (*new_file)->filehand = newhand; - (*new_file)->fname = apr_pstrdup((*new_file)->cntxt, old_file->fname); - (*new_file)->append = old_file->append; - (*new_file)->buffered = FALSE; + new_file->flags = newflags; + new_file->filehand = newhand; + new_file->fname = apr_pstrdup(new_file->cntxt, old_file->fname); + new_file->append = old_file->append; + new_file->buffered = FALSE; return APR_SUCCESS; } |