Fix warnings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907680 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/main/ms_wdv.c b/modules/dav/main/ms_wdv.c
index dc368ba264d2c657fae4beae465e5666597fb85b..d9cccad5f93c0aee91267b3140abbbc0bb287f1b 100644 (file)
--- a/modules/dav/main/ms_wdv.c
+++ b/modules/dav/main/ms_wdv.c
@@ -168,7 +168,6 @@ static dav_error *mswdv_combined_lock(request_rec *r)
     const char *lock_timeout_hdr;
     dav_locktoken *lock_token;
     time_t lock_timeout = 0;
-    apr_status_t status;
     dav_error *err = NULL;
     const dav_hooks_locks *locks_hooks = DAV_GET_HOOKS_LOCKS(r);
     dav_lockdb *lockdb = NULL;
@@ -180,7 +179,6 @@ static dav_error *mswdv_combined_lock(request_rec *r)
     int timeout_zero = 0;
     int token_match = 0;
     int lock_exists = 0;
-    int locked_by_other = 0;
     /* action */
     const char *failmsg = NULL;
     int http_error = HTTP_BAD_REQUEST;
@@ -227,7 +225,7 @@ static dav_error *mswdv_combined_lock(request_rec *r)
     }
 
     /*
-     * Determine is token_match, lock_exists and locked_by_other
+     * Determine is token_match, lock_exists and owner
      */
     if ((err = dav_get_resource(r, 0, 0, &resource)) != NULL)
         goto out;
@@ -260,7 +258,8 @@ static dav_error *mswdv_combined_lock(request_rec *r)
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                   "%s lock_exists = %d, owner = \"%s\", "
-                  "token_match = %d, lock_timeout = %ld, timeout_zero = %d",
+                  "token_match = %d, lock_timeout = %" APR_TIME_T_FMT
+                  ", timeout_zero = %d",
                   __func__, lock_exists, owner ? owner : "-", token_match,
                   lock_timeout, timeout_zero);
 
@@ -493,7 +492,7 @@ done:
         apr_table_setn(r->headers_out, "X-MSDAVEXTLockTimeout",
                        newlock->timeout == DAV_TIMEOUT_INFINITE ?
                        "Infinite" :
-                       apr_psprintf(r->pool, "Second-%d",
+                       apr_psprintf(r->pool, "Second-%" APR_TIME_T_FMT,
                                       newlock->timeout - time(NULL)));
 
         /* Add a If: lock header to palcate further PUT processing */
@@ -520,7 +519,6 @@ static dav_error *mswdv_combined_propfind(request_rec *r)
     apr_bucket_brigade *bbsub;
     apr_bucket_brigade *bb;
     ap_filter_t *f;
-    apr_bucket *b;
     request_rec *rr = NULL;
     apr_off_t length;
     apr_status_t status;
@@ -588,21 +586,12 @@ static dav_error *mswdv_combined_propfind(request_rec *r)
  */
 static dav_error *mswdv_combined_proppatch(request_rec *r)
 {
-    dav_error *err = NULL;
-    apr_bucket_brigade *bbsub;
     apr_bucket_brigade *bb;
-    apr_bucket *b;
     apr_status_t status;
-    char *proppach_data;
     apr_size_t len = 16;
     apr_off_t proppatch_len;
     char proppatch_len_str[16 + 1];
     char *proppatch_data;
-    apr_off_t index;
-    apr_size_t proppatch_datalen;
-    ap_filter_t *f;
-    request_rec *rr;
-    int ret;
 
     bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);