You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/03/28 18:34:07 UTC
cvs commit: httpd-2.0/modules/dav/main mod_dav.c mod_dav.h util_lock.c
trawick 01/03/28 08:34:07
Modified: modules/dav/fs lock.c
modules/dav/main mod_dav.c mod_dav.h util_lock.c
Log:
clean up some warnings dealing with
1) mismatches between printf format strings and arguments
2) wrong type for last parm to ap[r]_xml_to_text
3) missing time.h decls
Revision Changes Path
1.18 +4 -2 httpd-2.0/modules/dav/fs/lock.c
Index: lock.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/lock.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lock.c 2001/02/23 10:15:08 1.17
+++ lock.c 2001/03/28 16:34:03 1.18
@@ -712,7 +712,8 @@
DAV_ERR_LOCK_CORRUPT_DB,
apr_psprintf(p,
"The lock database was found to "
- "be corrupt. offset %i, c=%02x",
+ "be corrupt. offset %"
+ APR_SIZE_T_FMT ", c=%02x",
offset, val.dptr[offset]));
}
}
@@ -909,7 +910,8 @@
|| amt != pbuf->cur_len) {
err = dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0,
apr_psprintf(p,
- "Error writing %i bytes to %s",
+ "Error writing %" APR_SIZE_T_FMT
+ " bytes to %s",
pbuf->cur_len, pathname));
}
1.53 +1 -1 httpd-2.0/modules/dav/main/mod_dav.c
Index: mod_dav.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_dav.c 2001/03/28 07:37:25 1.52
+++ mod_dav.c 2001/03/28 16:34:04 1.53
@@ -3542,7 +3542,7 @@
int is_label = 0;
int depth;
int result;
- int tsize;
+ apr_size_t tsize;
const char *target;
dav_response *multi_response;
dav_error *err;
1.46 +1 -0 httpd-2.0/modules/dav/main/mod_dav.h
Index: mod_dav.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mod_dav.h 2001/03/28 07:37:25 1.45
+++ mod_dav.h 2001/03/28 16:34:05 1.46
@@ -68,6 +68,7 @@
#include "util_xml.h"
#include <limits.h> /* for INT_MAX */
+#include <time.h> /* for time_t */
#ifdef __cplusplus
extern "C" {
1.16 +1 -1 httpd-2.0/modules/dav/main/util_lock.c
Index: util_lock.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/util_lock.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- util_lock.c 2001/03/13 02:13:55 1.15
+++ util_lock.c 2001/03/28 16:34:05 1.16
@@ -173,7 +173,7 @@
}
else {
time_t now = time(NULL);
- sprintf(tmp, "Second-%lu", lock->timeout - now);
+ sprintf(tmp, "Second-%lu", (long unsigned int)(lock->timeout - now));
dav_buffer_append(p, pbuf, tmp);
}