Per W. Stoddard, Greg Marr and my research, let's get this right.

  This change is a decorative NOOP.  It accurately reflects what the
  MSVC compiler actuall turned into bytecode.  We hope this change
  makes the actual fns clearer to the developer.

  However, there is no effective difference.  The _stdcall declaration
  for these functions was _ignored_ by MSVC, which treated the fn's
  as _cdecl (our API_EXPORT_NONSTD macro) because they use varargs.

  This time, buff.c:ap_bvputs() was out of sync (correct to this patch)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@92965 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ap/ap_snprintf.c b/src/ap/ap_snprintf.c
index 882a8135252e623b1816d1216c4c13a6e3e01de3..a4c1ed3eec643dcab4d2790214418b06a43b05e6 100644 (file)
--- a/src/ap/ap_snprintf.c
+++ b/src/ap/ap_snprintf.c
@@ -1171,7 +1171,7 @@ static int snprintf_flush(ap_vformatter_buff *vbuff)
 }
 
 
-API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+API_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, const char *format,...)
 {
     int cc;
     va_list ap;

diff --git a/src/include/ap.h b/src/include/ap.h
index bf498002170adb2eef7ceec4b54520b37d938826..829284d59bdc1b1d6eccfbdd5956f7b70a3e9e24 100644 (file)
--- a/src/include/ap.h
+++ b/src/include/ap.h
@@ -159,7 +159,7 @@ API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff *),
  * to distinguish between an output which was truncated, and an output which
  * exactly filled the buffer.
  */
-API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+API_EXPORT_NONSTD(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);

diff --git a/src/include/ap_alloc.h b/src/include/ap_alloc.h
index 2ec5e33e382e2d59d022d6932afe010d315be375..6954f6c3a32dff15b94ce888eaa48f964bed9d90 100644 (file)
--- a/src/include/ap_alloc.h
+++ b/src/include/ap_alloc.h
@@ -232,8 +232,8 @@ API_EXPORT(void) ap_table_mergen(table *, const char *name, const char *more_val
 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(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
-                         const table *t,...);
+API_EXPORT_NONSTD(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);
 

diff --git a/src/include/buff.h b/src/include/buff.h
index 5032b181a498c7f78febe4d83ea197afa4ae5055..150fd266e15b88ede4b76e1679a700151909a5c2 100644 (file)
--- a/src/include/buff.h
+++ b/src/include/buff.h
@@ -172,7 +172,7 @@ API_EXPORT(int) ap_bskiplf(BUFF *fb);
 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(int) ap_bvputs(BUFF *fb,...);
+API_EXPORT_NONSTD(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);

diff --git a/src/include/http_log.h b/src/include/http_log.h
index e0fafbb79135938811fe7bd13bfc53e44f255a4f..0e7a11d1334a9a445862dca94bb47b5a34fb2259 100644 (file)
--- a/src/include/http_log.h
+++ b/src/include/http_log.h
@@ -115,10 +115,10 @@ API_EXPORT(void) ap_open_logs (server_rec *, pool *p);
  * attack and other messy behavior.  Instead, use a simple format string
  * like "%s", followed by the string containing the untrusted data.
  */
-API_EXPORT(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT_NONSTD(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(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT_NONSTD(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_pid (pool *p, char *fname);
 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(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT_NONSTD(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);

diff --git a/src/include/http_protocol.h b/src/include/http_protocol.h
index d05d70b441fb507e711ea7a8fef2e0de62767141..968c4dbbd2e96106b1970e4fcb804dc26d4867cb 100644 (file)
--- a/src/include/http_protocol.h
+++ b/src/include/http_protocol.h
@@ -150,7 +150,7 @@ API_EXPORT(int) ap_rputs(const char *str, request_rec *r);
 API_EXPORT(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);
 API_EXPORT_NONSTD(int) ap_rvputs(request_rec *r,...);
 API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
-API_EXPORT(int) ap_rprintf(request_rec *r, const char *fmt,...)
+API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
                                __attribute__((format(printf,2,3)));
 API_EXPORT(int) ap_rflush(request_rec *r);
 

diff --git a/src/main/alloc.c b/src/main/alloc.c
index f6a6f7fc1c7ed3db667612c4aa0f8effa58028c1..b31409d1a60220f6d5eb15b97a68e68f6a1379d4 100644 (file)
--- a/src/main/alloc.c
+++ b/src/main/alloc.c
@@ -1480,8 +1480,8 @@ API_EXPORT(table *) ap_overlay_tables(pool *p, const table *overlay, const table
  * Note that rec is simply passed-on to the comp function, so that the
  * caller can pass additional info for the task.
  */
-API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
-             const table *t,...)
+API_EXPORT_NONSTD(void) ap_table_do(int (*comp) (void *, const char *, const char *), 
+                                   void *rec, const table *t,...)
 {
     va_list vp;
     char *argp;

diff --git a/src/main/http_log.c b/src/main/http_log.c
index df536b12674f812b5f6ead9ece31089b6f32572c..82de525985bde4ab88ee8d618f661a6f8a5f34f2 100644 (file)
--- a/src/main/http_log.c
+++ b/src/main/http_log.c
@@ -472,7 +472,7 @@ static void log_error_core(const char *file, int line, int level,
 #endif
 }
     
-API_EXPORT(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT_NONSTD(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 @@ API_EXPORT(void) ap_log_error(const char *file, int line, int level,
     va_end(args);
 }
 
-API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT_NONSTD(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 @@ API_EXPORT(void) ap_log_unixerr(const char *routine, const char *file,
     ap_log_error(file, 0, APLOG_ERR, s, "%s", msg);
 }
 
-API_EXPORT(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT_NONSTD(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
 {
     va_list args;
     

diff --git a/src/main/http_protocol.c b/src/main/http_protocol.c
index 516daa0252d3c293860e2556ecf07332697e295a..f6ff6cf2ae373bb8022341ec5bfd50310c7805f4 100644 (file)
--- a/src/main/http_protocol.c
+++ b/src/main/http_protocol.c
@@ -2569,7 +2569,7 @@ API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list ap)
     return n;
 }
 
-API_EXPORT(int) ap_rprintf(request_rec *r, const char *fmt,...)
+API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
 {
     va_list vlist;
     int n;