httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/time/win32 access.c
Date Fri, 08 Oct 1999 20:04:46 GMT
rbb         99/10/08 13:04:46

  Modified:    src/lib/apr acconfig.h
               src/lib/apr/file_io/unix fileacc.c
               src/lib/apr/file_io/win32 fileacc.c
               src/lib/apr/include apr_general.h apr_lock.h
               src/lib/apr/locks/unix locks.c
               src/lib/apr/locks/win32 locks.c
               src/lib/apr/misc/beos start.c
               src/lib/apr/misc/unix start.c
               src/lib/apr/misc/win32 start.c
               src/lib/apr/network_io/beos poll.c sockets.c
               src/lib/apr/network_io/unix poll.c sockets.c
               src/lib/apr/network_io/win32 poll.c sockets.c
               src/lib/apr/test testcontext.c testthread.c
               src/lib/apr/threadproc/beos procsup.c
               src/lib/apr/threadproc/unix procsup.c thread.c threadpriv.c
               src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
               src/lib/apr/time/unix access.c
               src/lib/apr/time/win32 access.c
  Log:
  Bring the misc code up to the APR parameter order spec.  This also fixes a few
  files I missed when doing the locks argument ordering fixes.
  
  Revision  Changes    Path
  1.5       +1 -1      apache-2.0/src/lib/apr/acconfig.h
  
  Index: acconfig.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- acconfig.h	1999/10/08 17:29:25	1.4
  +++ acconfig.h	1999/10/08 20:03:32	1.5
  @@ -70,7 +70,7 @@
   #define SAFETY_LOCK(func_name, cnt, name_str) \
       { \
       if (lock_##func_name == NULL) \
  -        if (ap_create_lock(cnt, APR_MUTEX, APR_INTRAPROCESS, name_str, &lock_##func_name)
!= APR_SUCCESS) \
  +        if (ap_create_lock(&lock_##func_name, APR_MUTEX, APR_INTRAPROCESS, name_str,
cnt) != APR_SUCCESS) \
               return APR_NOTTHREADSAFE; \
       if (ap_lock(lock_##func_name) != APR_SUCCESS) \
           return APR_NOTTHREADSAFE; \
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fileacc.c	1999/10/06 23:03:46	1.8
  +++ fileacc.c	1999/10/08 20:03:36	1.9
  @@ -260,7 +260,7 @@
   ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
   {    
       if (file != NULL) {
  -        return ap_get_userdata(&data, file->cntxt, key);
  +        return ap_get_userdata(&data, key, file->cntxt);
       }
       else {
           data = NULL;
  @@ -281,7 +281,7 @@
                               ap_status_t (*cleanup) (void *))
   {    
       if (file != NULL) {
  -        return ap_set_userdata(file->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, file->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.7       +2 -2      apache-2.0/src/lib/apr/file_io/win32/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- fileacc.c	1999/10/06 23:03:53	1.6
  +++ fileacc.c	1999/10/08 20:03:41	1.7
  @@ -183,7 +183,7 @@
   ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
   {    
       if (file != NULL) {
  -        return ap_get_userdata(&data, file->cntxt, key);
  +        return ap_get_userdata(&data, key, file->cntxt);
       }
       else {
           data = NULL;
  @@ -195,7 +195,7 @@
                               ap_status_t (*cleanup) (void *))
   {    
       if (file != NULL) {
  -        return ap_set_userdata(file->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, file->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_general.h	1999/10/04 16:36:54	1.5
  +++ apr_general.h	1999/10/08 20:03:45	1.6
  @@ -228,9 +228,9 @@
   ap_status_t ap_create_context(ap_context_t **, ap_context_t *);
   ap_status_t ap_destroy_context(struct context_t *cont);
   ap_status_t ap_exit(ap_context_t *);
  -ap_status_t ap_set_userdata(ap_context_t *, void *, char *, 
  -                            ap_status_t (*cleanup) (void *));
  -ap_status_t ap_get_userdata(void **, ap_context_t *, char *);
  +ap_status_t ap_set_userdata(void *, char *, 
  +                            ap_status_t (*cleanup) (void *), ap_context_t *);
  +ap_status_t ap_get_userdata(void **, char *, ap_context_t *);
   ap_status_t ap_initialize(void);
   
   ap_status_t ap_create_signal(ap_context_t *, ap_signum_t);
  
  
  
  1.5       +3 -3      apache-2.0/src/lib/apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_lock.h	1999/10/04 16:36:54	1.4
  +++ apr_lock.h	1999/10/08 20:03:47	1.5
  @@ -70,12 +70,12 @@
   typedef struct lock_t           ap_lock_t;
   
   /*   Function definitions */
  -ap_status_t ap_create_lock(ap_context_t *, ap_locktype_e, ap_lockscope_e, 
  -                           char *, ap_lock_t **);
  +ap_status_t ap_create_lock(ap_lock_t **, ap_locktype_e, ap_lockscope_e, 
  +                           char *, ap_context_t *);
   ap_status_t ap_lock(ap_lock_t *);
   ap_status_t ap_unlock(ap_lock_t *);
   ap_status_t ap_destroy_lock(ap_lock_t *);
  -ap_status_t ap_child_init_lock(ap_lock_t **, ap_context_t *, char *);
  +ap_status_t ap_child_init_lock(ap_lock_t **, char *, ap_context_t *);
   
   ap_status_t ap_get_lockdata(ap_lock_t *, char *, void *);
   ap_status_t ap_set_lockdata(ap_lock_t *, void *, char *,
  
  
  
  1.7       +2 -2      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- locks.c	1999/10/08 18:53:28	1.6
  +++ locks.c	1999/10/08 20:03:50	1.7
  @@ -204,7 +204,7 @@
   ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
  -        return ap_get_userdata(&data, lock->cntxt, key);
  +        return ap_get_userdata(&data, key, lock->cntxt);
       }
       else {
           data = NULL;
  @@ -225,7 +225,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  -        return ap_set_userdata(lock->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, lock->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.8       +2 -2      apache-2.0/src/lib/apr/locks/win32/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- locks.c	1999/10/08 18:53:29	1.7
  +++ locks.c	1999/10/08 20:03:54	1.8
  @@ -167,7 +167,7 @@
   ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
  -        return ap_get_userdata(&data, lock->cntxt, key);
  +        return ap_get_userdata(&data, key, lock->cntxt);
       }
       else {
           data = NULL;
  @@ -179,7 +179,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  -        return ap_set_userdata(lock->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, lock->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.7       +4 -3      apache-2.0/src/lib/apr/misc/beos/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- start.c	1999/10/08 11:29:54	1.6
  +++ start.c	1999/10/08 20:03:57	1.7
  @@ -99,8 +99,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_userdata(void *data, char *key,
  +                            ap_status_t (*cleanup) (void *),
  +                            struct context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -130,7 +131,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
  +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.10      +4 -3      apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- start.c	1999/10/07 21:58:29	1.9
  +++ start.c	1999/10/08 20:04:03	1.10
  @@ -132,8 +132,9 @@
    *        It is advised that steps are taken to ensure that a unique
    *        key is used at all times.
    */
  -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_userdata(void *data, char *key,
  +                            ap_status_t (*cleanup) (void *),
  +                            struct context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -170,7 +171,7 @@
    * arg 2) The key for the data to retrieve
    * arg 3) The user data associated with the context.
    */
  -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
  +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.7       +4 -3      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- start.c	1999/10/04 16:37:03	1.6
  +++ start.c	1999/10/08 20:04:11	1.7
  @@ -146,8 +146,9 @@
   	return APR_EEXIST;
   }
   
  -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_userdata(void *data, char *key,
  +                            ap_status_t (*cleanup) (void *),
  +                            struct context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -177,7 +178,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
  +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- poll.c	1999/10/08 11:12:14	1.3
  +++ poll.c	1999/10/08 20:04:13	1.4
  @@ -210,7 +210,7 @@
   ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
  -        return ap_get_userdata(&data, pollfd->cntxt, key);
  +        return ap_get_userdata(&data, key, pollfd->cntxt);
       }
       else {
           data = NULL;
  @@ -222,7 +222,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  -        return ap_set_userdata(pollfd->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sockets.c	1999/10/08 11:13:13	1.4
  +++ sockets.c	1999/10/08 20:04:15	1.5
  @@ -229,7 +229,7 @@
   ap_status_t ap_get_socketdata(struct socket_t *sock, char *key, void *data)
   {
       if (socket != NULL) {
  -        return ap_get_userdata(&data, sock->cntxt, key);
  +        return ap_get_userdata(&data, key, sock->cntxt);
       }
       else {
           data = NULL;
  @@ -241,7 +241,7 @@
                                 ap_status_t (*cleanup) (void *))
   {
       if (sock != NULL) {
  -        return ap_set_userdata(sock->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, sock->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- poll.c	1999/10/05 11:13:09	1.8
  +++ poll.c	1999/10/08 20:04:17	1.9
  @@ -436,7 +436,7 @@
   ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
  -        return ap_get_userdata(&data, pollfd->cntxt, key);
  +        return ap_get_userdata(&data, key, pollfd->cntxt);
       }
       else {
           data = NULL;
  @@ -456,7 +456,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  -        return ap_set_userdata(pollfd->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.13      +2 -2      apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- sockets.c	1999/10/08 19:44:31	1.12
  +++ sockets.c	1999/10/08 20:04:18	1.13
  @@ -320,7 +320,7 @@
   ap_status_t ap_get_socketdata(struct socket_t *sock, char *key, void *data)
   {
       if (socket != NULL) {
  -        return ap_get_userdata(&data, sock->cntxt, key);
  +        return ap_get_userdata(&data, key, sock->cntxt);
       }
       else {
           data = NULL;
  @@ -339,7 +339,7 @@
                                 ap_status_t (*cleanup) (void *))
   {
       if (sock != NULL) {
  -        return ap_set_userdata(sock->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, sock->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- poll.c	1999/10/04 22:44:19	1.4
  +++ poll.c	1999/10/08 20:04:22	1.5
  @@ -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(&data, pollfd->cntxt, key);
  +        return ap_get_userdata(&data, key, pollfd->cntxt);
       }
       else {
           data = NULL;
  @@ -211,7 +211,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  -        return ap_set_userdata(pollfd->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.7       +2 -2      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sockets.c	1999/10/04 22:44:18	1.6
  +++ sockets.c	1999/10/08 20:04:24	1.7
  @@ -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(&data, socket->cntxt, key);
  +        return ap_get_userdata(&data, key, socket->cntxt);
       }
       else {
           data = NULL;
  @@ -279,7 +279,7 @@
                                 ap_status_t (*cleanup) (void *))
   {
       if (socket != NULL) {
  -        return ap_set_userdata(socket->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, socket->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/test/testcontext.c
  
  Index: testcontext.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testcontext.c	1999/10/04 16:37:24	1.2
  +++ testcontext.c	1999/10/08 20:04:29	1.3
  @@ -79,9 +79,9 @@
   
       testdata = ap_pstrdup(context, "This is a test\n");
   
  -    ap_set_userdata(context, testdata, "TEST", string_cleanup);    
  +    ap_set_userdata(testdata, "TEST", string_cleanup, context);    
   
  -    ap_get_userdata((void **)&retdata, context, "TEST");
  +    ap_get_userdata((void **)&retdata, "TEST", context);
   
       if (!strcmp(testdata, retdata)) {
           fprintf(stdout, "User data is working ok\n");
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testthread.c	1999/10/04 16:37:25	1.4
  +++ testthread.c	1999/10/08 20:04:30	1.5
  @@ -136,7 +136,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Initializing the lock......."); 
  -    s1 = ap_create_lock(context, APR_MUTEX, APR_INTRAPROCESS, "lock.file", &thread_lock);

  +    s1 = ap_create_lock(&thread_lock, APR_MUTEX, APR_INTRAPROCESS, "lock.file", context);

       if (s1 != APR_SUCCESS) {
           fprintf(stderr, "Could not create lock\n");
           exit(-1);
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- procsup.c	1999/10/08 11:22:53	1.3
  +++ procsup.c	1999/10/08 20:04:32	1.4
  @@ -100,7 +100,7 @@
   ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
   {
       if (proc != NULL) {
  -        return ap_get_userdata(&data, proc->cntxt, key);
  +        return ap_get_userdata(&data, key, proc->cntxt);
       }
       else {
           data = NULL;
  @@ -112,7 +112,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (proc != NULL) {
  -        return ap_set_userdata(proc->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, proc->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- procsup.c	1999/10/04 16:37:40	1.4
  +++ procsup.c	1999/10/08 20:04:34	1.5
  @@ -141,7 +141,7 @@
   ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
   {
       if (proc != NULL) {
  -        return ap_get_userdata(&data, proc->cntxt, key);
  +        return ap_get_userdata(&data, key, proc->cntxt);
       }
       else {
           data = NULL;
  @@ -160,7 +160,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (proc != NULL) {
  -        return ap_set_userdata(proc->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, proc->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- thread.c	1999/10/04 16:37:40	1.4
  +++ thread.c	1999/10/08 20:04:34	1.5
  @@ -227,7 +227,7 @@
   ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
   {
       if (thread != NULL) {
  -        return ap_get_userdata(&data, thread->cntxt, key);
  +        return ap_get_userdata(&data, key, thread->cntxt);
       }
       else {
           data = NULL;
  @@ -246,7 +246,7 @@
                                 ap_status_t (*cleanup) (void *))
   {
       if (thread != NULL) {
  -        return ap_set_userdata(thread->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, thread->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadpriv.c	1999/10/04 16:37:40	1.4
  +++ threadpriv.c	1999/10/08 20:04:35	1.5
  @@ -139,7 +139,7 @@
   ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, void *data)
   {
       if (threadkey != NULL) {
  -        return ap_get_userdata(&data, threadkey->cntxt, key);
  +        return ap_get_userdata(&data, key, threadkey->cntxt);
       }
       else {
           data = NULL;
  @@ -158,7 +158,7 @@
                                    char *key, ap_status_t (*cleanup) (void *))
   {
       if (threadkey != NULL) {
  -        return ap_set_userdata(threadkey->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- proc.c	1999/10/04 22:37:15	1.4
  +++ proc.c	1999/10/08 20:04:38	1.5
  @@ -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(&data, proc->cntxt, key);
  +        return ap_get_userdata(&data, key, proc->cntxt);
       }
       else {
           data = NULL;
  @@ -353,7 +353,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (proc != NULL) {
  -        return ap_set_userdata(proc->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, proc->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread.c	1999/10/04 22:37:16	1.5
  +++ thread.c	1999/10/08 20:04:39	1.6
  @@ -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(&data, thread->cntxt, key);
  +        return ap_get_userdata(&data, key, thread->cntxt);
       }
       else {
           data = NULL;
  @@ -171,7 +171,7 @@
                                 ap_status_t (*cleanup) (void *))
   {
       if (thread != NULL) {
  -        return ap_set_userdata(thread->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, thread->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadpriv.c	1999/10/04 22:37:17	1.4
  +++ threadpriv.c	1999/10/08 20:04:39	1.5
  @@ -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(&data, threadkey->cntxt, key);
  +        return ap_get_userdata(&data, key, threadkey->cntxt);
       }
       else {
           data = NULL;
  @@ -106,7 +106,7 @@
                                    char *key, ap_status_t (*cleanup) (void *))
   {
       if (threadkey != NULL) {
  -        return ap_set_userdata(threadkey->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/time/unix/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/access.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- access.c	1999/10/04 16:37:45	1.4
  +++ access.c	1999/10/08 20:04:42	1.5
  @@ -343,7 +343,7 @@
   ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
   {
       if (atime != NULL) {
  -        return ap_get_userdata(&data, atime->cntxt, key);
  +        return ap_get_userdata(&data, key, atime->cntxt);
       }
       else {
           data = NULL;
  @@ -362,7 +362,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (atime != NULL) {
  -        return ap_set_userdata(atime->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, atime->cntxt);
       }
       else {
           data = NULL;
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- access.c	1999/10/04 22:37:08	1.3
  +++ access.c	1999/10/08 20:04:44	1.4
  @@ -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(&data, atime->cntxt, key);
  +        return ap_get_userdata(&data, key, atime->cntxt);
       }
       else {
           data = NULL;
  @@ -257,7 +257,7 @@
                               ap_status_t (*cleanup) (void *))
   {
       if (atime != NULL) {
  -        return ap_set_userdata(atime->cntxt, data, key, cleanup);
  +        return ap_set_userdata(data, key, cleanup, atime->cntxt);
       }
       else {
           data = NULL;
  
  
  

Mime
View raw message