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/test testsf.c
Date Fri, 03 Nov 2000 18:05:11 GMT
trawick     00/11/03 10:05:10

  Modified:    src/lib/apr/include apr_network_io.h
               src/lib/apr/network_io/unix sendrecv.c
               src/lib/apr/network_io/win32 sendrecv.c
               src/lib/apr/test testsf.c
  Log:
  Make the len parm to apr_sendfile() apr_ssize_t * instead of apr_size_t *
  for consistency with other APR network send/recv calls.
  
  Revision  Changes    Path
  1.59      +1 -1      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- apr_network_io.h	2000/11/03 15:36:17	1.58
  +++ apr_network_io.h	2000/11/03 18:04:59	1.59
  @@ -301,7 +301,7 @@
    *      The number of bytes actually sent is stored in argument 5.
    */
   apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file, apr_hdtr_t *hdtr, 
  -                          apr_off_t *offset, apr_size_t *len, apr_int32_t flags);
  +                          apr_off_t *offset, apr_ssize_t *len, apr_int32_t flags);
   #endif
   
   /**
  
  
  
  1.44      +5 -5      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- sendrecv.c	2000/10/12 01:32:23	1.43
  +++ sendrecv.c	2000/11/03 18:05:02	1.44
  @@ -251,7 +251,7 @@
   }
   
   apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
  -        		apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
  +        		apr_hdtr_t *hdtr, apr_off_t *offset, apr_ssize_t *len,
           		apr_int32_t flags)
   {
       off_t off = *offset;
  @@ -382,7 +382,7 @@
   
   /* Release 3.1 or greater */
   apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
  -        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
           		apr_int32_t flags)
   {
       off_t nbytes;
  @@ -475,7 +475,7 @@
   
   /* HP-UX Version 10.30 or greater */
   apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
  -        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
           		apr_int32_t flags)
   {
       int i, ptr = 0;
  @@ -582,7 +582,7 @@
    * OS/390 - V2R7 and above
    */
   apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
  -                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
                           apr_int32_t flags)
   {
       int i, ptr, rv = 0;
  @@ -711,7 +711,7 @@
    * all cases of the headers and trailers seems to be a good idea.
    */
   apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
  -                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
                           apr_int32_t flags)
   {
       off_t nbytes = 0;
  
  
  
  1.28      +2 -2      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- sendrecv.c	2000/10/06 17:24:39	1.27
  +++ sendrecv.c	2000/11/03 18:05:04	1.28
  @@ -179,7 +179,7 @@
   
   /*
    * apr_status_t apr_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, 
  - *                         apr_off_t *, apr_size_t *, apr_int32_t flags)
  + *                         apr_off_t *, apr_ssize_t *, apr_int32_t flags)
    *    Send a file from an open file descriptor to a socket, along with 
    *    optional headers and trailers
    * arg 1) The socket to which we're writing
  @@ -190,7 +190,7 @@
    * arg 6) APR flags that are mapped to OS specific flags
    */
   apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
  -                          apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +                          apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
                             apr_int32_t flags) 
   {
       apr_status_t status = APR_SUCCESS;
  
  
  
  1.10      +3 -2      apache-2.0/src/lib/apr/test/testsf.c
  
  Index: testsf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsf.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- testsf.c	2000/10/05 17:32:39	1.9
  +++ testsf.c	2000/11/03 18:05:09	1.10
  @@ -195,7 +195,8 @@
       apr_pool_t *p;
       char buf[120];
       apr_file_t *f = NULL;
  -    apr_size_t len, expected_len;
  +    apr_ssize_t len;
  +    apr_size_t expected_len;
       apr_off_t current_file_offset;
       apr_hdtr_t hdtr;
       struct iovec headers[3];
  @@ -330,7 +331,7 @@
           current_file_offset = 0;
           len = FILE_LENGTH;
           do {
  -            apr_size_t tmplen;
  +            apr_ssize_t tmplen;
   
               tmplen = len; /* bytes remaining to send from the file */
               printf("Calling apr_sendfile()...\n");
  
  
  

Mime
View raw message