diff options
| author | Jim Jagielski <jim@apache.org> | 2011-09-23 15:39:32 +0200 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2011-09-23 15:39:32 +0200 |
| commit | 427c85bd2353796cbd8253854dd2fb2ccfbf8bdc (patch) | |
| tree | f1decb7874c49c67162ebdbf1db997a92e0b5834 /modules/dav/fs/repos.c | |
| parent | Cleanup effort in prep for GA push: (diff) | |
| download | apache2-427c85bd2353796cbd8253854dd2fb2ccfbf8bdc.tar.xz apache2-427c85bd2353796cbd8253854dd2fb2ccfbf8bdc.zip | |
Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/dav/fs/repos.c')
| -rw-r--r-- | modules/dav/fs/repos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 7a22000083..40395ca87e 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -143,7 +143,7 @@ enum { /* * prefix for temporary files */ -#define DAV_FS_TMP_PREFIX ".davfs.tmp" +#define DAV_FS_TMP_PREFIX ".davfs.tmp" static const dav_liveprop_spec dav_fs_props[] = { @@ -360,7 +360,7 @@ static dav_error * dav_fs_copymove_file( dav_set_bufsize(p, pbuf, DAV_FS_COPY_BLOCKSIZE); - if ((status = apr_file_open(&inf, src, APR_READ | APR_BINARY, + if ((status = apr_file_open(&inf, src, APR_READ | APR_BINARY, APR_OS_DEFAULT, p)) != APR_SUCCESS) { /* ### use something besides 500? */ return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, status, @@ -391,7 +391,7 @@ static dav_error * dav_fs_copymove_file( /* ### ACK! Inconsistent state... */ /* ### use something besides 500? */ - return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, + return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, lcl_status, "Could not delete output after read " "failure. Server is now in an " @@ -448,7 +448,7 @@ static dav_error * dav_fs_copymove_file( "server may be in an " "inconsistent state.", src, dst)); return err; - } + } else if ((lcl_status = apr_file_remove(dst, p)) != APR_SUCCESS) { /* ### ACK. this creates an inconsistency. do more!? */ @@ -899,7 +899,7 @@ static apr_status_t dav_fs_mktemp(apr_file_t **fp, char *templ, apr_pool_t *p) APR_WRITE | APR_CREATE | APR_BINARY | APR_EXCL, APR_OS_DEFAULT, p); } while (APR_STATUS_IS_EEXIST(rv)); - + return rv; } |