httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@arctic.org>
Subject Re: cvs commit: apache-2.0/src/os/unix iol_socket.c
Date Tue, 26 Oct 1999 22:58:00 GMT

On 20 Oct 1999 manoj@hyperreal.org wrote:

> manoj       99/10/20 12:38:28
> 
>   Modified:    src/include ap_iol.h
>                src/main iol_file.c
>                src/os/unix iol_socket.c
>   Log:
>   Change some ints to ap_size_t to be more "correct" for APR and Unix I/O.

int is signed... i think you should have made these ap_ssize_t...

Dean

>   Revision  Changes    Path
>   1.7       +3 -2      apache-2.0/src/include/ap_iol.h
>   
>   Index: ap_iol.h
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v
>   retrieving revision 1.6
>   retrieving revision 1.7
>   diff -u -d -u -r1.6 -r1.7
>   --- ap_iol.h	1999/10/20 19:35:17	1.6
>   +++ ap_iol.h	1999/10/20 19:38:20	1.7
>   @@ -60,6 +60,7 @@
>    #ifndef AP_IOL_H
>    #define AP_IOL_H
>    
>   +#include "apr_general.h" /* For ap_s?size_t */
>    #include "apr_errno.h" /* For ap_status_t and the APR_errnos */
>    
>    typedef struct ap_iol ap_iol;
>   @@ -103,11 +104,11 @@
>    
>    struct ap_iol_methods {
>        ap_status_t (*close)(ap_iol *fd);
>   -    ap_status_t (*write)(ap_iol *fd, const char *buf, int len,
>   +    ap_status_t (*write)(ap_iol *fd, const char *buf, ap_size_t len,
>                             ap_ssize_t *nbytes);
>        ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, int nvec,
>                              ap_ssize_t *nbytes);
>   -    ap_status_t (*read)(ap_iol *fd, char *buf, int len,
>   +    ap_status_t (*read)(ap_iol *fd, char *buf, ap_size_t len,
>                            ap_ssize_t *nbytes);
>        ap_status_t (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
>        ap_status_t (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
>   
>   
>   
>   1.5       +4 -4      apache-2.0/src/main/iol_file.c
>   
>   Index: iol_file.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -d -u -r1.4 -r1.5
>   --- iol_file.c	1999/10/20 19:35:26	1.4
>   +++ iol_file.c	1999/10/20 19:38:23	1.5
>   @@ -85,10 +85,10 @@
>    	return errno; \
>        }
>    
>   -method(write, (ap_iol *viol, const char *arg1, int arg2,
>   +method(write, (ap_iol *viol, const char *arg1, ap_size_t arg2,
>                   ap_ssize_t *nbytes))
>    method(writev, (ap_iol *viol, const struct iovec *arg1, int arg2, ap_ssize_t *nbytes))
>   -method(read, (ap_iol *viol, char *arg1, int arg2, ap_ssize_t *nbytes))
>   +method(read, (ap_iol *viol, char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
>    
>    
>    static ap_status_t file_close(ap_iol *viol)
>   @@ -164,9 +164,9 @@
>    	return rv; \
>        }
>    
>   -method(ap_write, (ap_iol *viol, const char *arg1, int arg2, ap_ssize_t *nbytes))
>   +method(ap_write, (ap_iol *viol, const char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
>    method(ap_writev, (ap_iol *viol, const struct iovec *arg1, int arg2, ap_ssize_t *nbytes))
>   -method(ap_read, (ap_iol *viol, char *arg1, int arg2, ap_ssize_t *nbytes))
>   +method(ap_read, (ap_iol *viol, char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
>    
>    
>    /* This function will clean-up the iol struct and close the file... */
>   
>   
>   
>   1.6       +2 -2      apache-2.0/src/os/unix/iol_socket.c
>   
>   Index: iol_socket.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
>   retrieving revision 1.5
>   retrieving revision 1.6
>   diff -u -d -u -r1.5 -r1.6
>   --- iol_socket.c	1999/10/20 19:35:29	1.5
>   +++ iol_socket.c	1999/10/20 19:38:27	1.6
>   @@ -199,9 +199,9 @@
>    	return errno; \
>        }
>    
>   -method(write, (ap_iol *viol, const char *arg1, int arg2, ap_ssize_t *nbytes), write,
NULL, &fdset)
>   +method(write, (ap_iol *viol, const char *arg1, ap_size_t arg2, ap_ssize_t *nbytes),
write, NULL, &fdset)
>    method(writev, (ap_iol *viol, const struct iovec *arg1, int arg2, ap_ssize_t *nbytes),
writev, NULL, &fdset)
>   -method(read, (ap_iol *viol, char *arg1, int arg2, ap_ssize_t *nbytes), read, &fdset,
NULL)
>   +method(read, (ap_iol *viol, char *arg1, ap_size_t arg2, ap_ssize_t *nbytes), read,
&fdset, NULL)
>    
>    static ap_status_t unix_close(ap_iol *viol)
>    {
>   
>   
>   
> 



Mime
View raw message