httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/include apr_errno.h apr_file_io.h apr_general.h apr_network_io.h apr_thread_proc.h
Date Mon, 10 May 1999 16:58:19 GMT
rbb         99/05/10 09:58:19

  Modified:    include  apr_errno.h apr_file_io.h apr_general.h
                        apr_network_io.h apr_thread_proc.h
  Log:
  My cvs extract got messed up, so these changes weren't put in before.  I'm going
  to check it again.
  
  Revision  Changes    Path
  1.7       +1 -1      apache-apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_errno.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_errno.h	1999/04/29 20:20:38	1.6
  +++ apr_errno.h	1999/05/10 16:58:17	1.7
  @@ -61,7 +61,7 @@
   /* If this definition of APRStatus changes, then we can remove this, but right
      now, the decision was to use an errno-like implementation.
   */
  -typedef int apr_status_t;
  +typedef int ap_status_t;
   
   #define APR_SUCCESS 1
   #define APR_FAILURE -1 
  
  
  
  1.21      +30 -30    apache-apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_file_io.h	1999/04/30 18:38:57	1.20
  +++ apr_file_io.h	1999/05/10 16:58:17	1.21
  @@ -67,7 +67,7 @@
   #include "apr_errno.h"
   
   
  -/* Flags for apr_open */
  +/* Flags for ap_open */
   #define APR_READ     1           /* Open the file for reading */
   #define APR_WRITE    2           /* Open the file for writing */
   #define APR_CREATE   4           /* Create the file if not there */
  @@ -78,7 +78,7 @@
   #define APR_EXCL     128         /* Open should fail if APR_CREATE and file
   				    exists. */
   
  -/* flags for apr_seek */
  +/* flags for ap_seek */
   #define APR_SET SEEK_SET
   #define APR_CUR SEEK_CUR
   #define APR_END SEEK_END
  @@ -97,40 +97,40 @@
   #define APR_WEXECUTE  WEXECUTE
   
   /* should be same as whence type in lseek, POSIZ defines this as int */
  -typedef apr_int32_t       apr_seek_where_t;
  +typedef ap_int32_t       ap_seek_where_t;
   
  -typedef struct file_t     apr_file_t;
  -typedef struct dir_t      apr_dir_t;
  -typedef fileperms_t       apr_fileperms_t;
  -typedef dirent_t          apr_dirent_t;
  -typedef iovec_t           apr_iovec_t;
  +typedef struct file_t     ap_file_t;
  +typedef struct dir_t      ap_dir_t;
  +typedef fileperms_t       ap_fileperms_t;
  +typedef dirent_t          ap_dirent_t;
  +typedef iovec_t           ap_iovec_t;
   
   /*   Function definitions */
  -apr_file_t *apr_open(apr_context_t *, char *, apr_int32_t, apr_fileperms_t);
  -apr_status_t apr_close(apr_context_t *, apr_file_t *);
  -apr_status_t apr_remove_file(apr_context_t *, char *);
  -
  -apr_ssize_t apr_read(apr_context_t *, apr_file_t *, void *, apr_ssize_t);
  -apr_ssize_t apr_write(apr_context_t *, apr_file_t *, void *, apr_ssize_t);
  -apr_ssize_t apr_writev(apr_context_t *, apr_file_t *, const apr_iovec_t *, apr_ssize_t);
  -
  -apr_file_t *apr_dupfile(apr_context_t *, apr_file_t *);
  -apr_status_t apr_getfileinfo(apr_context_t *, char *, apr_file_t *);
  -apr_status_t apr_updatefileinfo(apr_context_t *, apr_file_t *);
  -apr_off_t apr_seek(apr_context_t *, apr_file_t *, apr_off_t, apr_seek_where_t);
  -
  -apr_dir_t *apr_opendir(apr_context_t *, const char *);
  -apr_status_t apr_closedir(apr_context_t *, apr_dir_t *);
  -apr_dirent_t *apr_readdir(apr_context_t *, apr_dir_t *);
  -apr_status_t apr_rewinddir(apr_context_t *, apr_dir_t *);
  -apr_status_t apr_make_dir(apr_context_t *, const char *, apr_fileperms_t);
  -apr_status_t apr_remove_dir(apr_context_t *, const char *);
  +ap_file_t *ap_open(ap_context_t *, char *, ap_int32_t, ap_fileperms_t);
  +ap_status_t ap_close(ap_context_t *, ap_file_t *);
  +ap_status_t ap_remove_file(ap_context_t *, char *);
  +
  +ap_ssize_t ap_read(ap_context_t *, ap_file_t *, void *, ap_ssize_t);
  +ap_ssize_t ap_write(ap_context_t *, ap_file_t *, void *, ap_ssize_t);
  +ap_ssize_t ap_writev(ap_context_t *, ap_file_t *, const ap_iovec_t *, ap_ssize_t);
  +
  +ap_file_t *ap_dupfile(ap_context_t *, ap_file_t *);
  +ap_status_t ap_getfileinfo(ap_context_t *, char *, ap_file_t *);
  +ap_status_t ap_updatefileinfo(ap_context_t *, ap_file_t *);
  +ap_off_t ap_seek(ap_context_t *, ap_file_t *, ap_off_t, ap_seek_where_t);
  +
  +ap_dir_t *ap_opendir(ap_context_t *, const char *);
  +ap_status_t ap_closedir(ap_context_t *, ap_dir_t *);
  +ap_dirent_t *ap_readdir(ap_context_t *, ap_dir_t *);
  +ap_status_t ap_rewinddir(ap_context_t *, ap_dir_t *);
  +ap_status_t ap_make_dir(ap_context_t *, const char *, ap_fileperms_t);
  +ap_status_t ap_remove_dir(ap_context_t *, const char *);
   
  -apr_status_t apr_create_pipe(apr_context_t *, apr_file_t *, apr_file_t *);
  -char *apr_create_namedpipe(apr_context_t *, char *, apr_fileperms_t);
  +ap_status_t ap_create_pipe(ap_context_t *, ap_file_t *, ap_file_t *);
  +char *ap_create_namedpipe(ap_context_t *, char *, ap_fileperms_t);
   
   /*accessor and general file_io functions. */
  -char *apr_get_filename(apr_context_t *, apr_file_t *);
  +char *ap_get_filename(ap_context_t *, ap_file_t *);
   
   
   #endif  /* ! APR_FILE_IO_H */
  
  
  
  1.10      +18 -18    apache-apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_general.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_general.h	1999/04/29 20:20:38	1.9
  +++ apr_general.h	1999/05/10 16:58:17	1.10
  @@ -64,31 +64,31 @@
   #define TRUE 1
   #define FALSE 0
   
  -typedef short             apr_int16_t;
  -typedef unsigned short    apr_uint16_t;
  -typedef int               apr_int32_t;
  -typedef unsigned int      apr_uint32_t;
  -typedef long              apr_int64_t;
  -typedef unsigned long     apr_uint64_t;
  +typedef short             ap_int16_t;
  +typedef unsigned short    ap_uint16_t;
  +typedef int               ap_int32_t;
  +typedef unsigned int      ap_uint32_t;
  +typedef long              ap_int64_t;
  +typedef unsigned long     ap_uint64_t;
   
  -typedef size_t            apr_size_t; 
  -typedef ssize_t           apr_ssize_t; 
  +typedef size_t            ap_size_t; 
  +typedef ssize_t           ap_ssize_t; 
   
  -typedef off_t             apr_off_t;
  +typedef off_t             ap_off_t;
   
   typedef struct context_t {
  -    struct apr_pool_t *pool;
  -    apr_int16_t signal_safe;
  -    apr_int16_t cancel_safe;
  +    struct ap_pool_t *pool;
  +    ap_int16_t signal_safe;
  +    ap_int16_t cancel_safe;
       void *prog_data;
  -} apr_context_t;   
  +} ap_context_t;   
   
   /* Context functions */
  -apr_context_t *apr_initialize(void *);
  -apr_status_t apr_set_signal_safe(apr_context_t *, apr_int16_t );
  -apr_status_t apr_set_cancel_safe(apr_context_t *, apr_int16_t); 
  -apr_context_t *apr_create_sub_context(apr_context_t *, void *);
  -apr_status_t apr_destroy_context(apr_context_t *);
  +ap_context_t *ap_initialize(void *);
  +ap_status_t ap_set_signal_safe(ap_context_t *, ap_int16_t );
  +ap_status_t ap_set_cancel_safe(ap_context_t *, ap_int16_t); 
  +ap_context_t *ap_create_sub_context(ap_context_t *, void *);
  +ap_status_t ap_destroy_context(ap_context_t *);
   
   
   #endif  /* ! APR_GENERAL_H */
  
  
  
  1.16      +17 -17    apache-apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_network_io.h	1999/04/30 18:38:58	1.15
  +++ apr_network_io.h	1999/05/10 16:58:18	1.16
  @@ -83,32 +83,32 @@
   #define APR_POLLNVAL  APOLLNVAL
   
   typedef enum {APR_SHUTDOWN_READ, APR_SHUTDOWN_WRITE, 
  -	      APR_SHUTDOWN_READWRITE} apr_shutdown_how_e;
  +	      APR_SHUTDOWN_READWRITE} ap_shutdown_how_e;
   
  -typedef struct socket_t     apr_socket_t;
  -typedef struct pollfd_t    apr_pollfd_t;
  +typedef struct socket_t     ap_socket_t;
  +typedef struct pollfd_t    ap_pollfd_t;
   
   /* function definitions */
   
  -apr_socket_t *apr_create_tcp_socket(apr_context_t *);
  -apr_status_t apr_shutdown(apr_context_t *, apr_socket_t *, apr_shutdown_how_e);
  -apr_status_t apr_close_socket(apr_context_t *, apr_socket_t *);
  +ap_socket_t *ap_create_tcp_socket(ap_context_t *);
  +ap_status_t ap_shutdown(ap_context_t *, ap_socket_t *, ap_shutdown_how_e);
  +ap_status_t ap_close_socket(ap_context_t *, ap_socket_t *);
   
  -apr_status_t apr_bind(apr_context_t *, apr_socket_t *);
  -apr_status_t apr_listen(apr_context_t *, apr_socket_t *, apr_int32_t);
  -apr_socket_t *apr_accept(apr_context_t *, const apr_socket_t *);
  -apr_status_t apr_connect(apr_context_t *, apr_socket_t *, char *);
  +ap_status_t ap_bind(ap_context_t *, ap_socket_t *);
  +ap_status_t ap_listen(ap_context_t *, ap_socket_t *, ap_int32_t);
  +ap_socket_t *ap_accept(ap_context_t *, const ap_socket_t *);
  +ap_status_t ap_connect(ap_context_t *, ap_socket_t *, char *);
   
  -char *aprget_remote_hostname(apr_context_t *, apr_socket_t *);
  -apr_status_t apr_gethostname(apr_context_t *, char *, int);
  +char *aprget_remote_hostname(ap_context_t *, ap_socket_t *);
  +ap_status_t ap_gethostname(ap_context_t *, char *, int);
   
  -apr_ssize_t apr_send(apr_context_t *, apr_socket_t *, const char *, int, time_t);
  -apr_ssize_t apr_recv(apr_context_t *, apr_socket_t *, char *, int, time_t);
  +ap_ssize_t ap_send(ap_context_t *, ap_socket_t *, const char *, int, time_t);
  +ap_ssize_t ap_recv(ap_context_t *, ap_socket_t *, char *, int, time_t);
   
  -apr_status_t apr_setsocketopt(apr_context_t *, apr_socket_t *, apr_int32_t, apr_int32_t);
  -apr_status_t apr_setport(apr_context_t *, apr_socket_t *, apr_uint32_t);
  +ap_status_t ap_setsocketopt(ap_context_t *, ap_socket_t *, ap_int32_t, ap_int32_t);
  +ap_status_t ap_setport(ap_context_t *, ap_socket_t *, ap_uint32_t);
   
  -apr_int32_t apr_poll(apr_context_t *, apr_pollfd_t *, apr_int32_t, apr_int32_t);
  +ap_int32_t ap_poll(ap_context_t *, ap_pollfd_t *, ap_int32_t, ap_int32_t);
   /*  accessor functions   */
   
   #endif  /* ! APR_FILE_IO_H */
  
  
  
  1.7       +18 -18    apache-apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_thread_proc.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_thread_proc.h	1999/04/30 18:38:58	1.6
  +++ apr_thread_proc.h	1999/05/10 16:58:18	1.7
  @@ -60,31 +60,31 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  -typedef enum {APR_SHELLCMD, APR_PROGRAM} apr_cmdtype_e;
  -typedef enum {APR_WAIT, APR_NOWAIT} apr_wait_how_e;
  +typedef enum {APR_SHELLCMD, APR_PROGRAM} ap_cmdtype_e;
  +typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e;
   
  -typedef struct thread_t           apr_thread_t;
  -typedef struct threadattr_t       apr_threadattr_t;
  -typedef struct proc_t		  apr_proc_t;
  -typedef struct procattr_t         apr_procattr_t;
  +typedef struct thread_t           ap_thread_t;
  +typedef struct threadattr_t       ap_threadattr_t;
  +typedef struct proc_t		  ap_proc_t;
  +typedef struct procattr_t         ap_procattr_t;
   
   /* Thread Function definitions */
   
   
   
   /* Process Function definitions */
  -apr_procattr_t *apr_createprocattr_init(apr_context_t *);
  -apr_status_t apr_setprocattr_io(apr_context_t *, apr_procattr_t *, apr_int32_t, apr_int32_t,
apr_int32_t);
  -apr_status_t apr_setprocattr_dir(apr_context_t *, apr_procattr_t *, char *);
  -apr_status_t apr_setprocattr_cmdtype(apr_context_t *, apr_procattr_t *, apr_cmdtype_e);
  -
  -apr_file_t *apr_get_childin(apr_context_t *, apr_proc_t *);
  -apr_file_t *apr_get_childout(apr_context_t *, apr_proc_t *);
  -apr_file_t *apr_get_childerr(apr_context_t *, apr_proc_t *);
  -
  -apr_int32_t apr_fork(apr_context_t *, apr_proc_t *);
  -apr_proc_t *apr_create_process(apr_context_t *, char *, char *const [], char **, apr_procattr_t
*);
  -apr_status_t apr_wait_proc(apr_context_t *, apr_proc_t *, apr_wait_how_e);
  +ap_procattr_t *ap_createprocattr_init(ap_context_t *);
  +ap_status_t ap_setprocattr_io(ap_context_t *, ap_procattr_t *, ap_int32_t, ap_int32_t,
ap_int32_t);
  +ap_status_t ap_setprocattr_dir(ap_context_t *, ap_procattr_t *, char *);
  +ap_status_t ap_setprocattr_cmdtype(ap_context_t *, ap_procattr_t *, ap_cmdtype_e);
  +
  +ap_file_t *ap_get_childin(ap_context_t *, ap_proc_t *);
  +ap_file_t *ap_get_childout(ap_context_t *, ap_proc_t *);
  +ap_file_t *ap_get_childerr(ap_context_t *, ap_proc_t *);
  +
  +ap_int32_t ap_fork(ap_context_t *, ap_proc_t *);
  +ap_proc_t *ap_create_process(ap_context_t *, char *, char *const [], char **, ap_procattr_t
*);
  +ap_status_t ap_wait_proc(ap_context_t *, ap_proc_t *, ap_wait_how_e);
   
   #endif  /* ! APR_FILE_IO_H */
   
  
  
  

Mime
View raw message