httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_http.c
Date Fri, 12 Dec 2003 12:36:50 GMT
jorton      2003/12/12 04:36:50

  Modified:    modules/ssl ssl_scache_dbm.c ssl_engine_io.c
               modules/proxy proxy_http.c
  Log:
  Fix format string warnings from gcc on amd64:
  
  * modules/ssl/ssl_scache_dbm.c (ssl_scache_dbm_store):
  Print apr_size_t using APR_SIZE_T_FMT.
  
  * modules/ssl/ssl_engine_io.c (ssl_filter_write): Print difference
  between sizes using APR_SSIZE_T_FMT, apr_size_t using APR_SIZE_T_FMT.
  
  * modules/proxy/proxy_http.c (ap_proxy_http_request): Print
  apr_uint64_t using APR_UINT64_T_HEX_FMT.
  
  Revision  Changes    Path
  1.22      +3 -2      httpd-2.0/modules/ssl/ssl_scache_dbm.c
  
  Index: ssl_scache_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_dbm.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -u -r1.21 -r1.22
  --- ssl_scache_dbm.c	25 Nov 2003 16:59:10 -0000	1.21
  +++ ssl_scache_dbm.c	12 Dec 2003 12:36:50 -0000	1.22
  @@ -147,8 +147,9 @@
       /* streamline session data */
       if ((nData = i2d_SSL_SESSION(sess, NULL)) > sizeof(ucaData)) {
           ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
  -                 "streamline session data size too large: %d > %d",
  -                 nData, sizeof(ucaData));
  +                     "streamline session data size too large: %d > "
  +                     "%" APR_SIZE_T_FMT,
  +                     nData, sizeof(ucaData));
           return FALSE;
       }
       ucp = ucaData;
  
  
  
  1.112     +2 -1      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -u -r1.111 -r1.112
  --- ssl_engine_io.c	29 Aug 2003 14:45:26 -0000	1.111
  +++ ssl_engine_io.c	12 Dec 2003 12:36:50 -0000	1.112
  @@ -832,7 +832,8 @@
           }
   
           ap_log_error(APLOG_MARK, APLOG_INFO, outctx->rc, c->base_server,
  -                     "failed to write %d of %d bytes (%s)",
  +                     "failed to write %" APR_SSIZE_T_FMT 
  +                     " of %" APR_SIZE_T_FMT " bytes (%s)",
                        len - (apr_size_t)res, len, reason);
   
           outctx->rc = APR_EGENERAL;
  
  
  
  1.174     +2 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.173
  retrieving revision 1.174
  diff -u -u -r1.173 -r1.174
  --- proxy_http.c	10 Dec 2003 19:26:15 -0000	1.173
  +++ proxy_http.c	12 Dec 2003 12:36:50 -0000	1.174
  @@ -700,7 +700,8 @@
               apr_brigade_length(input_brigade, 1, &bytes);
   
               hdr_len = apr_snprintf(chunk_hdr, sizeof(chunk_hdr),
  -                                   "%qx" CRLF, (apr_uint64_t)bytes);
  +                                   "%" APR_UINT64_T_HEX_FMT CRLF, 
  +                                   (apr_uint64_t)bytes);
   
               ap_xlate_proto_to_ascii(chunk_hdr, hdr_len);
               e = apr_bucket_transient_create(chunk_hdr, hdr_len,
  
  
  

Mime
View raw message