diff options
| author | jerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68> | 2001-12-29 06:55:24 +0000 |
|---|---|---|
| committer | jerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68> | 2001-12-29 06:55:24 +0000 |
| commit | 2cf16da096a6a48cc65e03ccc479228c5fc4374c (patch) | |
| tree | b712097e16f6e9d237d11708d996c15b165ab1d0 /file_io | |
| parent | a813225f9b61a32c65d2ab1d659213def247be06 (diff) | |
| download | libapr-2cf16da096a6a48cc65e03ccc479228c5fc4374c.tar.gz | |
Fix some stray tabs and wrap long lines.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
| -rw-r--r-- | file_io/unix/open.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/file_io/unix/open.c b/file_io/unix/open.c index df42b527e..97a15073e 100644 --- a/file_io/unix/open.c +++ b/file_io/unix/open.c @@ -80,13 +80,17 @@ apr_status_t apr_unix_file_cleanup(void *thefile) #endif } else { - /* Are there any error conditions other than EINTR or EBADF? */ + /* Are there any error conditions other than EINTR or EBADF? */ rv = errno; } return rv != APR_SUCCESS ? rv : flush_rv; } -APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr_int32_t flag, apr_fileperms_t perm, apr_pool_t *cont) +APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, + const char *fname, + apr_int32_t flag, + apr_fileperms_t perm, + apr_pool_t *cont) { int oflags = 0; #if APR_HAS_THREADS @@ -132,9 +136,9 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr if (flag & APR_CREATE) { oflags |= O_CREAT; - if (flag & APR_EXCL) { - oflags |= O_EXCL; - } + if (flag & APR_EXCL) { + oflags |= O_EXCL; + } } if ((flag & APR_EXCL) && !(flag & APR_CREATE)) { return APR_EACCES; @@ -188,7 +192,8 @@ APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *cont) } } -APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, const char *to_path, +APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, + const char *to_path, apr_pool_t *p) { if (rename(from_path, to_path) != 0) { @@ -197,13 +202,15 @@ APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, const char *to_ return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, apr_file_t *file) +APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, + apr_file_t *file) { *thefile = file->filedes; return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t *thefile, +APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, + apr_os_file_t *thefile, apr_pool_t *cont) { int *dafile = thefile; @@ -230,21 +237,24 @@ APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *cont) +APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, + apr_pool_t *cont) { int fd = STDERR_FILENO; return apr_os_file_put(thefile, &fd, cont); } -APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *cont) +APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, + apr_pool_t *cont) { int fd = STDOUT_FILENO; return apr_os_file_put(thefile, &fd, cont); } -APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *cont) +APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, + apr_pool_t *cont) { int fd = STDIN_FILENO; |