rbb 01/02/21 20:05:58
Modified: . CHANGES
include util_filter.h
modules/loggers mod_log_config.c
include apr_strings.h
include apr_buckets.h
Log:
Add a couple of GCC attribute tags to printf style functions. This also
fixes a couple of mismatched parameters highlighted revealed by the
attribute.
Submitted by: Jon Travis <[EMAIL PROTECTED]>
Revision Changes Path
1.105 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -b -w -u -r1.104 -r1.105
--- CHANGES 2001/02/22 03:55:22 1.104
+++ CHANGES 2001/02/22 04:05:57 1.105
@@ -1,5 +1,8 @@
Changes with Apache 2.0.12-dev
+ *) Add a couple of GCC attribute tags to printf style functions.
+ [Jon Travis <[EMAIL PROTECTED]>]
+
*) Add the correct language tag for interoperation with the Taiwanese
versions of MSIE and Netscape. [Clive Lin <[EMAIL PROTECTED]>] PR#7142
1.47 +2 -1 httpd-2.0/include/util_filter.h
Index: util_filter.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -b -w -u -r1.46 -r1.47
--- util_filter.h 2001/02/16 04:26:31 1.46
+++ util_filter.h 2001/02/22 04:05:57 1.47
@@ -460,7 +460,8 @@
* @param ... The argumets to use to fill out the format string
* @deffunc int ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const
char *fmt, ...)
*/
-AP_DECLARE_NONSTD(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb,
const char *fmt, ...);
+AP_DECLARE_NONSTD(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb,
const char *fmt, ...)
+ __attribute__((format(printf,3,4)));
#ifdef __cplusplus
}
1.51 +2 -2 httpd-2.0/modules/loggers/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -b -w -u -r1.50 -r1.51
--- mod_log_config.c 2001/02/16 13:38:25 1.50
+++ mod_log_config.c 2001/02/22 04:05:58 1.51
@@ -490,13 +490,13 @@
static const char *log_request_duration(request_rec *r, char *a)
{
- return apr_psprintf(r->pool, "%ld", (apr_time_now() - r->request_time)
+ return apr_psprintf(r->pool, "%qd", (apr_time_now() - r->request_time)
/ APR_USEC_PER_SEC);
}
static const char *log_request_duration_microseconds(request_rec *r, char *a)
{
- return apr_psprintf(r->pool, "%ld", (apr_time_now() - r->request_time));
+ return apr_psprintf(r->pool, "%qd", (apr_time_now() - r->request_time));
}
/* These next two routines use the canonical name:port so that log
1.14 +2 -1 apr/include/apr_strings.h
Index: apr_strings.h
===================================================================
RCS file: /home/cvs/apr/include/apr_strings.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -b -w -u -r1.13 -r1.14
--- apr_strings.h 2001/02/16 04:15:47 1.13
+++ apr_strings.h 2001/02/22 04:05:58 1.14
@@ -177,7 +177,8 @@
* @return The new string
* @deffunc char *apr_psprintf(apr_pool_t *p, const char *fmt, ...)
*/
-APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...);
+APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
+ __attribute__((format(printf,2,3)));
/**
* copy n characters from src to des>
1.81 +2 -1 apr-util/include/apr_buckets.h
Index: apr_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -b -w -u -r1.80 -r1.81
--- apr_buckets.h 2001/02/19 01:42:56 1.80
+++ apr_buckets.h 2001/02/22 04:05:58 1.81
@@ -731,7 +731,8 @@
*/
APU_DECLARE_NONSTD(int) apr_brigade_printf(apr_bucket_brigade *b,
apr_brigade_flush flush, void
*ctx,
- const char *fmt, ...);
+ const char *fmt, ...)
+ __attribute__((format(printf,4,5)));
/**
* Evaluate a printf and put the resulting string at the end
