httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/main alloc.c http_log.c http_protocol.c
Date Mon, 21 Jan 2002 21:56:44 GMT
wrowe       02/01/21 13:56:44

  Modified:    src/ap   ap_snprintf.c
               src/include ap.h ap_alloc.h buff.h http_log.h
                        http_protocol.h
               src/main alloc.c http_log.c http_protocol.c
  Log:
    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)
  
  Revision  Changes    Path
  1.49      +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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ap_snprintf.c	20 Jan 2002 19:19:09 -0000	1.48
  +++ ap_snprintf.c	21 Jan 2002 21:56:43 -0000	1.49
  @@ -1171,7 +1171,7 @@
   }
   
   
  -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;
  
  
  
  1.32      +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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ap.h	20 Jan 2002 19:19:09 -0000	1.31
  +++ ap.h	21 Jan 2002 21:56:43 -0000	1.32
  @@ -159,7 +159,7 @@
    * 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);
  
  
  
  1.78      +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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- ap_alloc.h	20 Jan 2002 19:19:09 -0000	1.77
  +++ ap_alloc.h	21 Jan 2002 21:56:43 -0000	1.78
  @@ -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(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);
   
  
  
  
  1.54      +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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- buff.h	20 Jan 2002 22:51:15 -0000	1.53
  +++ buff.h	21 Jan 2002 21:56:43 -0000	1.54
  @@ -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(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);
  
  
  
  1.40      +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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- http_log.h	20 Jan 2002 19:19:10 -0000	1.39
  +++ http_log.h	21 Jan 2002 21:56:43 -0000	1.40
  @@ -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(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_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);
  
  
  
  1.56      +1 -1      apache-1.3/src/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/http_protocol.h,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- http_protocol.h	21 Jan 2002 20:29:12 -0000	1.55
  +++ http_protocol.h	21 Jan 2002 21:56:43 -0000	1.56
  @@ -150,7 +150,7 @@
   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);
   
  
  
  
  1.126     +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.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- alloc.c	20 Jan 2002 19:19:10 -0000	1.125
  +++ alloc.c	21 Jan 2002 21:56:43 -0000	1.126
  @@ -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(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;
  
  
  
  1.92      +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.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- http_log.c	20 Jan 2002 19:19:10 -0000	1.91
  +++ http_log.c	21 Jan 2002 21:56:43 -0000	1.92
  @@ -472,7 +472,7 @@
   #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 @@
       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 @@
       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;
       
  
  
  
  1.310     +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.309
  retrieving revision 1.310
  diff -u -r1.309 -r1.310
  --- http_protocol.c	20 Jan 2002 20:14:37 -0000	1.309
  +++ http_protocol.c	21 Jan 2002 21:56:43 -0000	1.310
  @@ -2569,7 +2569,7 @@
       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;
  
  
  

Mime
View raw message