httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/file_io/unix readwrite.c
Date Sat, 15 Apr 2000 03:02:59 GMT
trawick     00/04/14 20:02:59

  Modified:    src/lib/apr/file_io/unix readwrite.c
  Log:
  Avoid some compiler warnings (two of which indicated logic
  errors) introduced with the buffered I/O code.
  
  Revision  Changes    Path
  1.43      +3 -0      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- readwrite.c	2000/04/15 02:56:48	1.42
  +++ readwrite.c	2000/04/15 03:02:59	1.43
  @@ -53,6 +53,7 @@
    */
   
   #include "fileio.h"
  +#include "apr_lock.h"
   
   static ap_status_t wait_for_io_or_timeout(ap_file_t *file, int for_read)
   {
  @@ -118,6 +119,7 @@
               thefile->dataRead = 0;
           }
   
  +	rv = 0;
           while (rv == 0 && size > 0) {
               if (thefile->bufpos >= thefile->dataRead) {
                   thefile->dataRead = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
  @@ -213,6 +215,7 @@
               thefile->direction = 1;
           }
   
  +	rv = 0;
           while (rv == 0 && size > 0) {
               if (thefile->bufpos == APR_FILE_BUFSIZE)   /* write buffer is full*/
                   ap_flush(thefile);
  
  
  

Mime
View raw message