You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/01/20 20:19:10 UTC
cvs commit: apache-1.3/src/main alloc.c http_log.c http_protocol.c
wrowe 02/01/20 11:19:10
Modified: src/ap ap_snprintf.c
src/include ap.h ap_alloc.h buff.h http_log.h
src/main alloc.c http_log.c http_protocol.c
Log:
Per W. Stoddard and Jim Js' request - revert to binary compatibility.
These declarations are entirely wrong, of course, but we will trudge
on with 1.3.23 sharing this brokenness with 1.3.22 and prior.
Will be grepping and fixing in 2.0.31-dev, if similar problems exist.
Revision Changes Path
1.48 +1 -1 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ap_snprintf.c 28 Dec 2001 05:03:06 -0000 1.47
+++ ap_snprintf.c 20 Jan 2002 19:19:09 -0000 1.48
@@ -1171,7 +1171,7 @@
}
-API_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
{
int cc;
va_list ap;
1.31 +1 -1 apache-1.3/src/include/ap.h
Index: ap.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ap.h 28 Dec 2001 05:03:06 -0000 1.30
+++ ap.h 20 Jan 2002 19:19:09 -0000 1.31
@@ -159,7 +159,7 @@
* to distinguish between an output which was truncated, and an output which
* exactly filled the buffer.
*/
-API_EXPORT_NONSTD(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);
1.77 +2 -2 apache-1.3/src/include/ap_alloc.h
Index: ap_alloc.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_alloc.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ap_alloc.h 28 Dec 2001 05:03:06 -0000 1.76
+++ ap_alloc.h 20 Jan 2002 19:19:09 -0000 1.77
@@ -232,8 +232,8 @@
API_EXPORT(void) ap_table_unset(table *, const char *key);
API_EXPORT(void) ap_table_add(table *, const char *name, const char *val);
API_EXPORT(void) ap_table_addn(table *, const char *name, const char *val);
-API_EXPORT_NONSTD(void) ap_table_do(int (*comp) (void *, const char *, const char *),
- void *rec, const table *t,...);
+API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
+ const table *t,...);
API_EXPORT(table *) ap_overlay_tables(pool *p, const table *overlay, const table *base);
1.52 +1 -1 apache-1.3/src/include/buff.h
Index: buff.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/buff.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- buff.h 28 Dec 2001 05:03:06 -0000 1.51
+++ buff.h 20 Jan 2002 19:19:09 -0000 1.52
@@ -172,7 +172,7 @@
API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
API_EXPORT(int) ap_bflush(BUFF *fb);
API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
-API_EXPORT_NONSTD(int) ap_bvputs(BUFF *fb,...);
+API_EXPORT(int) ap_bvputs(BUFF *fb,...);
API_EXPORT_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt,...)
__attribute__((format(printf,2,3)));
API_EXPORT(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list vlist);
1.39 +3 -3 apache-1.3/src/include/http_log.h
Index: http_log.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_log.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- http_log.h 28 Dec 2001 05:03:06 -0000 1.38
+++ http_log.h 20 Jan 2002 19:19:10 -0000 1.39
@@ -115,10 +115,10 @@
* attack and other messy behavior. Instead, use a simple format string
* like "%s", followed by the string containing the untrusted data.
*/
-API_EXPORT_NONSTD(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT(void) ap_log_error(const char *file, int line, int level,
const server_rec *s, const char *fmt, ...)
__attribute__((format(printf,5,6)));
-API_EXPORT_NONSTD(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
const request_rec *s, const char *fmt, ...)
__attribute__((format(printf,5,6)));
API_EXPORT(void) ap_error_log2stderr (server_rec *);
@@ -130,7 +130,7 @@
API_EXPORT(void) ap_log_error_old(const char *err, server_rec *s);
API_EXPORT(void) ap_log_unixerr(const char *routine, const char *file,
const char *msg, server_rec *s);
-API_EXPORT_NONSTD(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
__attribute__((format(printf,2,3)));
API_EXPORT(void) ap_log_reason(const char *reason, const char *fname,
request_rec *r);
1.125 +2 -2 apache-1.3/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- alloc.c 28 Dec 2001 05:03:07 -0000 1.124
+++ alloc.c 20 Jan 2002 19:19:10 -0000 1.125
@@ -1480,8 +1480,8 @@
* Note that rec is simply passed-on to the comp function, so that the
* caller can pass additional info for the task.
*/
-API_EXPORT_NONSTD(void) ap_table_do(int (*comp) (void *, const char *, const char *),
- void *rec, const table *t,...)
+API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
+ const table *t,...)
{
va_list vp;
char *argp;
1.91 +3 -3 apache-1.3/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- http_log.c 28 Dec 2001 05:03:07 -0000 1.90
+++ http_log.c 20 Jan 2002 19:19:10 -0000 1.91
@@ -472,7 +472,7 @@
#endif
}
-API_EXPORT_NONSTD(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT(void) ap_log_error(const char *file, int line, int level,
const server_rec *s, const char *fmt, ...)
{
va_list args;
@@ -482,7 +482,7 @@
va_end(args);
}
-API_EXPORT_NONSTD(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
const request_rec *r, const char *fmt, ...)
{
va_list args;
@@ -567,7 +567,7 @@
ap_log_error(file, 0, APLOG_ERR, s, "%s", msg);
}
-API_EXPORT_NONSTD(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
{
va_list args;
1.308 +1 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- http_protocol.c 18 Jan 2002 20:26:06 -0000 1.307
+++ http_protocol.c 20 Jan 2002 19:19:10 -0000 1.308
@@ -2567,7 +2567,7 @@
return n;
}
-API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
+API_EXPORT(int) ap_rprintf(request_rec *r, const char *fmt,...)
{
va_list vlist;
int n;