dgaudet 97/10/06 22:38:50
Modified: src/main buff.h conf.h explain.h http_protocol.h
src/modules/standard mod_rewrite.h
Log:
More __attribute__((format(printf,x,y))) goodness.
Revision Changes Path
1.26 +2 -1 apachen/src/main/buff.h
Index: buff.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/buff.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- buff.h 1997/09/16 03:49:55 1.25
+++ buff.h 1997/10/07 05:38:45 1.26
@@ -147,7 +147,8 @@
API_EXPORT(int) bflush(BUFF *fb);
API_EXPORT(int) bputs(const char *x, BUFF *fb);
API_EXPORT(int) bvputs(BUFF *fb,...);
-API_EXPORT_NONSTD(int) bprintf(BUFF *fb, const char *fmt,...);
+API_EXPORT_NONSTD(int) bprintf(BUFF *fb, const char *fmt,...)
+ __attribute__((format(printf,2,3)));
API_EXPORT_NONSTD(int) vbprintf(BUFF *fb, const char *fmt, va_list vlist);
/* Internal routines */
1.146 +13 -12 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- conf.h 1997/10/07 05:27:03 1.145
+++ conf.h 1997/10/07 05:38:46 1.146
@@ -655,6 +655,17 @@
#define API_VAR_EXPORT
#endif
+/* So that we can use inline on some critical functions, and use
+ * GNUC attributes (such as to get -Wall warnings for printf-like
+ * functions).
+ */
+#if !defined(__GNUC__)
+#define ap_inline
+#define __attribute__(__x)
+#else
+#define ap_inline __inline__
+#endif
+
/* Do we have sys/resource.h; assume that BSD does. */
#ifndef HAVE_SYS_RESOURCE_H
#ifdef BSD
@@ -681,7 +692,8 @@
#define ap_snprintf snprintf
#define ap_vsnprintf vsnprintf
#else
-API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...);
+API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+ __attribute__((format(printf,3,4)));
API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
va_list ap);
#endif
@@ -835,17 +847,6 @@
#ifndef ap_inet_addr
#define ap_inet_addr inet_addr
-#endif
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).
- */
-#if !defined(__GNUC__)
-#define ap_inline
-#define __attribute__(__x)
-#else
-#define ap_inline __inline__
#endif
#ifdef NO_OTHER_CHILD
1.5 +2 -1 apachen/src/main/explain.h
Index: explain.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/explain.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- explain.h 1997/09/16 00:41:31 1.4
+++ explain.h 1997/10/07 05:38:46 1.5
@@ -9,7 +9,8 @@
#define Explain6(f,a1,a2,a3,a4,a5,a6)
#else
#define DEF_Explain static const char *__ExplainFile=__FILE__;
-void _Explain(const char *szFile, int nLine, const char *szFmt,...);
+void _Explain(const char *szFile, int nLine, const char *szFmt,...)
+ __attribute__((format(printf,3,4)));
#define Explain0(f) _Explain(__ExplainFile,__LINE__,f)
#define Explain1(f,a1) _Explain(__ExplainFile,__LINE__,f,a1)
#define Explain2(f,a1,a2) _Explain(__ExplainFile,__LINE__,f,a1,a2)
1.30 +2 -1 apachen/src/main/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_protocol.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- http_protocol.h 1997/09/14 10:04:59 1.29
+++ http_protocol.h 1997/10/07 05:38:46 1.30
@@ -128,7 +128,8 @@
API_EXPORT(int) rputs(const char *str, request_rec *r);
API_EXPORT(int) rwrite(const void *buf, int nbyte, request_rec *r);
API_EXPORT_NONSTD(int) rvputs(request_rec *r,...);
-API_EXPORT_NONSTD(int) rprintf(request_rec *r, const char *fmt,...);
+API_EXPORT_NONSTD(int) rprintf(request_rec *r, const char *fmt,...)
+ __attribute__((format(printf,2,3)));
API_EXPORT(int) rflush(request_rec *r);
/*
1.33 +2 -1 apachen/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_rewrite.h 1997/09/18 22:54:06 1.32
+++ mod_rewrite.h 1997/10/07 05:38:49 1.33
@@ -394,7 +394,8 @@
/* rewriting logfile support */
static void open_rewritelog(server_rec *s, pool *p);
static int rewritelog_child(void *cmd);
-static void rewritelog(request_rec *r, int level, const char *text, ...);
+static void rewritelog(request_rec *r, int level, const char *text, ...)
+ __attribute__((format(printf,3,4)));
static char *current_logtime(request_rec *r);
/* program map support */
