summaryrefslogtreecommitdiff
path: root/modules/dav
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2011-09-23 13:39:32 +0000
committerJim Jagielski <jim@apache.org>2011-09-23 13:39:32 +0000
commit427c85bd2353796cbd8253854dd2fb2ccfbf8bdc (patch)
treef1decb7874c49c67162ebdbf1db997a92e0b5834 /modules/dav
parent103f776c25b7fdd51da4f98643b8dcdb09efdce6 (diff)
downloadhttpd-427c85bd2353796cbd8253854dd2fb2ccfbf8bdc.tar.gz
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')
-rw-r--r--modules/dav/fs/repos.c10
-rw-r--r--modules/dav/main/mod_dav.c22
-rw-r--r--modules/dav/main/util.c4
3 files changed, 18 insertions, 18 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;
}
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index c246c3caae..7e0ae21807 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -1622,18 +1622,18 @@ static int dav_method_options(request_rec *r)
/* DAV header additions registered by external modules */
extensions = ap_list_provider_names(r->pool, DAV_OPTIONS_EXTENSION_GROUP, "0");
entry = (ap_list_provider_names_t *)extensions->elts;
-
+
for (i = 0; i < extensions->nelts; i++, entry++) {
- const dav_options_provider *options =
+ const dav_options_provider *options =
dav_get_options_providers(entry->provider_name);
-
+
if (options && options->dav_header) {
apr_text_header hoptions = { 0 };
-
+
options->dav_header(r, resource, &hoptions);
for (t = hoptions.first; t && t->text; t = t->next)
dav_level = apr_pstrcat(r->pool, dav_level, ",", t->text, NULL);
- }
+ }
}
/* ###
@@ -1782,18 +1782,18 @@ static int dav_method_options(request_rec *r)
/* additional methods registered by external modules */
extensions = ap_list_provider_names(r->pool, DAV_OPTIONS_EXTENSION_GROUP, "0");
entry = (ap_list_provider_names_t *)extensions->elts;
-
+
for (i = 0; i < extensions->nelts; i++, entry++) {
- const dav_options_provider *options =
+ const dav_options_provider *options =
dav_get_options_providers(entry->provider_name);
-
+
if (options && options->dav_method) {
apr_text_header hoptions = { 0 };
-
+
options->dav_method(r, resource, &hoptions);
for (t = hoptions.first; t && t->text; t = t->next)
apr_table_addn(methods, t->text, "");
- }
+ }
}
/* Generate the Allow header */
@@ -3045,7 +3045,7 @@ static int dav_method_lock(request_rec *r)
err = dav_new_error(r->pool, HTTP_CONFLICT, 0, 0,
apr_psprintf(r->pool,
"The parent resource of %s does not "
- "exist or is not a collection.",
+ "exist or is not a collection.",
ap_escape_html(r->pool, r->uri)));
return dav_handle_err(r, err, NULL);
}
diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 7659b721da..d076cc45fd 100644
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -1421,11 +1421,11 @@ static int dav_meets_conditions(request_rec *r, int resource_state)
retVal = ap_meets_conditions(r);
- /* If-None-Match '*' fix. If-None-Match '*' request should succeed
+ /* If-None-Match '*' fix. If-None-Match '*' request should succeed
* if the resource does not exist. */
if (retVal == HTTP_PRECONDITION_FAILED) {
/* Note. If if_none_match != NULL, if_none_match is the culprit.
- * Since, in presence of If-None-Match,
+ * Since, in presence of If-None-Match,
* other If-* headers are undefined. */
if ((if_none_match =
apr_table_get(r->headers_in, "If-None-Match")) != NULL) {