httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_status.c
Date Mon, 01 Oct 2001 15:51:07 GMT
wrowe       01/10/01 08:51:07

  Modified:    modules/generators mod_status.c
  Log:
    Clean up some warnings by summing bytecounts into apr_off_t holders
    instead of ulongs.
  
  Revision  Changes    Path
  1.47      +5 -7      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_status.c	2001/08/11 04:04:13	1.46
  +++ mod_status.c	2001/10/01 15:51:07	1.47
  @@ -160,7 +160,7 @@
   };
   
   /* Format the number of bytes nicely */
  -static void format_byte_out(request_rec *r, unsigned long bytes)
  +static void format_byte_out(request_rec *r, apr_off_t bytes)
   {
       if (bytes < (5 * KBYTE))
   	ap_rprintf(r, "%d B", (int) bytes);
  @@ -172,7 +172,7 @@
   	ap_rprintf(r, "%.1f GB", (float) bytes / GBYTE);
   }
   
  -static void format_kbyte_out(request_rec *r, unsigned long kbytes)
  +static void format_kbyte_out(request_rec *r, apr_off_t kbytes)
   {
       if (kbytes < KBYTE)
   	ap_rprintf(r, "%d kB", (int) kbytes);
  @@ -236,11 +236,9 @@
       int ready = 0;
       int busy = 0;
       unsigned long count = 0;
  -    unsigned long lres, bytes;
  -    unsigned long my_lres, my_bytes, conn_bytes;
  -    unsigned short conn_lres;
  -    unsigned long bcount = 0;
  -    unsigned long kbcount = 0;
  +    unsigned long lres, my_lres, conn_lres;
  +    apr_off_t bytes, my_bytes, conn_bytes;
  +    apr_off_t bcount = 0, kbcount = 0;
       long req_time;
   #ifdef HAVE_TIMES
   #ifdef _SC_CLK_TCK
  
  
  

Mime
View raw message