cvs commit: apache-2.0/src/lib/apr/file_io/unix dir.c fileacc.c

1999-10-04 Thread rbb 
rbb 99/10/04 06:37:20

  Modified:src/lib/apr/file_io/unix dir.c fileacc.c
  Log:
  Ifdef out the code that checks to make sure the file descriptor isn't a
  socket.  BeOS files cannot be sockets, so this code isn't needed and won't
  compile.
  Submitted by:  David Reid
  
  Revision  ChangesPath
  1.4   +2 -0  apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dir.c 1999/10/01 16:18:28 1.3
  +++ dir.c 1999/10/04 13:37:19 1.4
  @@ -264,8 +264,10 @@
   *type = APR_PIPE;
   if (S_ISLNK(filestat.st_mode))
   *type = APR_LNK;
  +#ifndef BEOS
   if (S_ISSOCK(filestat.st_mode))
   *type = APR_SOCK;
  +#endif
   return APR_SUCCESS;
   }
   
  
  
  
  1.6   +2 -0  apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fileacc.c 1999/10/01 16:18:28 1.5
  +++ fileacc.c 1999/10/04 13:37:19 1.6
  @@ -238,8 +238,10 @@
   *type = APR_PIPE;
   if (S_ISLNK(file-protection))
   *type = APR_LNK;
  +#ifndef BEOS
   if (S_ISSOCK(file-protection))
   *type = APR_SOCK;
  +#endif
   return APR_SUCCESS;
   }
   else {

cvs commit: apache-2.0/src/modules/standard mod_asis.c mod_auth.c mod_autoindex.c mod_log_config.c mod_negotiation.c

1999-10-04 Thread rbb 
rbb 99/10/04 09:38:18

  Modified:src/ap   ap_hooks.c
   src/lib/apr/file_io/os2 dir.c fileacc.c filedup.c open.c
pipe.c
   src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
open.c pipe.c
   src/lib/apr/file_io/win32 dir.c fileacc.c filedup.c pipe.c
   src/lib/apr/include apr_file_io.h apr_general.h apr_lock.h
apr_network_io.h apr_portable.h apr_shmem.h
apr_thread_proc.h apr_time.h
   src/lib/apr/locks/beos locks.c
   src/lib/apr/locks/os2 locks.c
   src/lib/apr/locks/unix crossproc.c locks.c locks.h
   src/lib/apr/locks/win32 locks.c
   src/lib/apr/misc/beos start.c
   src/lib/apr/misc/os2 start.c
   src/lib/apr/misc/unix start.c
   src/lib/apr/misc/win32 start.c
   src/lib/apr/network_io/beos sockets.c sockopt.c
   src/lib/apr/network_io/os2 poll.c sockets.c sockopt.c
   src/lib/apr/network_io/unix poll.c sockets.c sockopt.c
   src/lib/apr/network_io/win32 poll.c sockets.c sockopt.c
   src/lib/apr/shmem shmem.c
   src/lib/apr/shmem/unix shmem.c
   src/lib/apr/test Makefile.in ab_apr.c abc.c client.c
htdigest.c server.c testargs.c testcontext.c
testfile.c testproc.c testsig.c testsock.c
testthread.c testtime.c
   src/lib/apr/threadproc/beos proc.c procsup.c thread.c
threadpriv.c
   src/lib/apr/threadproc/os2 proc.c thread.c threadpriv.c
   src/lib/apr/threadproc/unix proc.c procsup.c thread.c
threadpriv.c threadproc.h
   src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
   src/lib/apr/time/os2 time.c
   src/lib/apr/time/unix access.c time.c
   src/lib/apr/time/win32 time.c
   src/main buff.c http_config.c http_core.c http_log.c
http_main.c http_protocol.c http_request.c listen.c
rfc1413.c util.c util_script.c
   src/modules/mpm/dexter acceptlock.c dexter.c
   src/modules/mpm/mpmt_pthread acceptlock.c mpmt_pthread.c
   src/modules/mpm/prefork prefork.c
   src/modules/standard mod_asis.c mod_auth.c mod_autoindex.c
mod_log_config.c mod_negotiation.c
  Log:
  First patch to re-order function parameters.  This one gets the low hanging
  fruit, and moves most of the result parameters to the first argument.
  Future patches in this series will move the rest of the result parameters
  to the beginning of the list, and will move the context's to the end of the
  list
  
  Revision  ChangesPath
  1.7   +1 -1  apache-2.0/src/ap/ap_hooks.c
  
  Index: ap_hooks.c
  ===
  RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_hooks.c1999/09/14 13:37:19 1.6
  +++ ap_hooks.c1999/10/04 16:36:44 1.7
  @@ -118,7 +118,7 @@
   ap_array_header_t *pNew;
   int n;
   
  -ap_create_context(g_pHookPool, p);
  +ap_create_context(p, g_pHookPool);
   pSort=prepare(p,(TSortData *)pHooks-elts,pHooks-nelts);
   tsort(pSort,pHooks-nelts);
   pNew=ap_make_array(g_pHookPool,pHooks-nelts,sizeof(TSortData));
  
  
  
  1.2   +2 -2  apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dir.c 1999/08/17 15:59:36 1.1
  +++ dir.c 1999/10/04 16:36:47 1.2
  @@ -69,7 +69,7 @@
   
   
   
  -ap_status_t ap_opendir(ap_context_t *cntxt, const char *dirname, struct 
dir_t **new)
  +ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cntxt, const char 
*dirname)
   {
   struct dir_t *thedir = (struct dir_t *)ap_palloc(cntxt, sizeof(struct 
dir_t));
   
  @@ -212,7 +212,7 @@
   
   
   
  -ap_status_t ap_get_dir_filename(struct dir_t *thedir, char **new)
  +ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
   {
   if (thedir-validentry) {
   *new = thedir-entry.achName;
  
  
  
  1.2   +1 -1  apache-2.0/src/lib/apr/file_io/os2/fileacc.c
  
  Index: fileacc.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileacc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fileacc.c 1999/08/17 15:59:36 1.1
  +++ fileacc.c 1999/10/04 16:36:47 1.2
  @@ -63,7 +63,7 @@
   
   /* A

cvs commit: apache-2.0/src/lib/apr/network_io/win32 sockets.c

1999-10-04 Thread stoddard 
stoddard99/10/04 10:55:49

  Modified:src/lib/apr/network_io/win32 sockets.c
  Log:
  Fix really silly bug.
  
  Revision  ChangesPath
  1.5   +1 -1  apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sockets.c 1999/10/04 16:37:16 1.4
  +++ sockets.c 1999/10/04 17:55:48 1.5
  @@ -292,7 +292,7 @@
   if (sock == NULL) {
   return APR_ENOSOCKET;
   }
  -thesock = (sock-sock);
  +*thesock = sock-sock;
   return APR_SUCCESS;
   }

cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c

1999-10-04 Thread stoddard 
stoddard99/10/04 15:37:21

  Modified:src/lib/apr/time/win32 time.c access.c
   src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
  Log:
  Ryan's last patch to change argument order missed a few Win32 APR funcs.
  
  Revision  ChangesPath
  1.3   +3 -3  apache-2.0/src/lib/apr/time/win32/time.c
  
  Index: time.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/time.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- time.c1999/10/04 16:37:48 1.2
  +++ time.c1999/10/04 22:37:06 1.3
  @@ -123,8 +123,8 @@
   return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_time(ap_context_t *cont, struct atime_t **thetime, 
  -   ap_os_time_t *atime)
  +ap_status_t ap_put_os_time(struct atime_t **thetime, ap_os_time_t *atime, 
  +   ap_context_t *cont)
   {
   if (cont == NULL) {
   return APR_ENOCONT;
  @@ -155,4 +155,4 @@
   
   *rv = (int)((ia - ib) / 1);
   return APR_SUCCESS;
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3   +1 -1  apache-2.0/src/lib/apr/time/win32/access.c
  
  Index: access.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/access.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- access.c  1999/09/22 17:48:03 1.2
  +++ access.c  1999/10/04 22:37:08 1.3
  @@ -245,7 +245,7 @@
   ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
   {
   if (atime != NULL) {
  -return ap_get_userdata(atime-cntxt, key, data);
  +return ap_get_userdata(data, atime-cntxt, key);
   }
   else {
   data = NULL;
  
  
  
  1.4   +9 -9  apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proc.c1999/10/04 16:37:42 1.3
  +++ proc.c1999/10/04 22:37:15 1.4
  @@ -95,20 +95,20 @@
   {
   ap_status_t stat;
   if (in) {
  -if ((stat = ap_create_pipe(attr-cntxt, attr-child_in, 
  -attr-parent_in)) != APR_SUCCESS) {
  +if ((stat = ap_create_pipe(attr-child_in, attr-parent_in, 
  +   attr-cntxt)) != APR_SUCCESS) {
   return stat;
   }
   } 
   if (out) {
  -if ((stat = ap_create_pipe(attr-cntxt, attr-parent_out, 
  -attr-child_out)) != APR_SUCCESS) {
  +if ((stat = ap_create_pipe(attr-parent_out, attr-child_out, 
  +   attr-cntxt)) != APR_SUCCESS) {
   return stat;
   }
   } 
   if (err) {
  -if ((stat = ap_create_pipe(attr-cntxt, attr-parent_err, 
  -attr-child_err)) != APR_SUCCESS) {
  +if ((stat = ap_create_pipe(attr-parent_err, attr-child_err, 
  +   attr-cntxt)) != APR_SUCCESS) {
   return stat;
   }
   } 
  @@ -341,7 +341,7 @@
   ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
   {
   if (proc != NULL) {
  -return ap_get_userdata(proc-cntxt, key, data);
  +return ap_get_userdata(data, proc-cntxt, key);
   }
   else {
   data = NULL;
  @@ -370,8 +370,8 @@
   return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_proc(ap_context_t *cont, struct proc_t **proc,
  -   ap_os_proc_t *theproc)
  +ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
  +   ap_context_t *cont)
   {
   if (cont == NULL) {
   return APR_ENOCONT;
  
  
  
  1.5   +3 -3  apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- thread.c  1999/10/04 16:37:42 1.4
  +++ thread.c  1999/10/04 22:37:16 1.5
  @@ -159,7 +159,7 @@
   ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
   {
   if (thread != NULL) {
  -return ap_get_userdata(thread-cntxt, key, data);
  +return ap_get_userdata(data, thread-cntxt, key);
   }
   else {
   data = NULL;
  @@ -188,8 +188,8 @@
   return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_thread(ap_context_t *cont, struct thread_t **thd,
  - ap_os_thread_t *thethd)
  +ap_status_t ap_put_os_thread(struct thread_t **thd, ap_os_thread_t *thethd, 
  +

cvs commit: apache-2.0/src/lib/apr/network_io/win32 sockets.c poll.c

1999-10-04 Thread stoddard 
stoddard99/10/04 15:44:21

  Modified:src/lib/apr/network_io/win32 sockets.c poll.c
  Log:
  A few more argument changes missed by Ryan's patch
  
  Revision  ChangesPath
  1.6   +3 -3  apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sockets.c 1999/10/04 17:55:48 1.5
  +++ sockets.c 1999/10/04 22:44:18 1.6
  @@ -267,7 +267,7 @@
   ap_status_t ap_get_socketdata(struct socket_t *socket, char *key, void *data)
   {
   if (socket != NULL) {
  -return ap_get_userdata(socket-cntxt, key, data);
  +return ap_get_userdata(data, socket-cntxt, key);
   }
   else {
   data = NULL;
  @@ -296,8 +296,8 @@
   return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(ap_context_t *cont, struct socket_t **sock,
  -ap_os_sock_t *thesock)
  +ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +   ap_context_t *cont)
   {
   if (cont == NULL) {
   return APR_ENOCONT;
  
  
  
  1.4   +1 -1  apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- poll.c1999/10/04 16:37:16 1.3
  +++ poll.c1999/10/04 22:44:19 1.4
  @@ -199,7 +199,7 @@
   ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
   if (pollfd != NULL) {
  -return ap_get_userdata(pollfd-cntxt, key, data);
  +return ap_get_userdata(data, pollfd-cntxt, key);
   }
   else {
   data = NULL;