httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
Date Mon, 04 Oct 1999 22:37:22 GMT
stoddard    99/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  Changes    Path
  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.c	1999/10/04 16:37:48	1.2
  +++ time.c	1999/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) / 10000);
       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.c	1999/10/04 16:37:42	1.3
  +++ proc.c	1999/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, 
  +                             ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.4       +3 -3      apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadpriv.c	1999/10/04 16:37:43	1.3
  +++ threadpriv.c	1999/10/04 22:37:17	1.4
  @@ -94,7 +94,7 @@
   ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, void *data)
   {
       if (threadkey != NULL) {
  -        return ap_get_userdata(threadkey->cntxt, key, &data);
  +        return ap_get_userdata(&data, threadkey->cntxt, key);
       }
       else {
           data = NULL;
  @@ -123,8 +123,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_threadkey(ap_context_t *cont, struct threadkey_t **key,
  -                                ap_os_threadkey_t *thekey)
  +ap_status_t ap_put_os_threadkey(struct threadkey_t **key, 
  +                                ap_os_threadkey_t *thekey, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  

Mime
View raw message