httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/win32 thread.c threadpriv.c
Date Sat, 08 Jul 2000 11:15:54 GMT
gstein      00/07/08 04:15:54

  Modified:    src/lib/apr/file_io/unix fileacc.c
               src/lib/apr/include apr_file_io.h apr_general.h apr_lock.h
                        apr_network_io.h apr_thread_proc.h
               src/lib/apr/locks/beos locks.c
               src/lib/apr/locks/unix locks.c
               src/lib/apr/locks/win32 locks.c
               src/lib/apr/misc/unix start.c
               src/lib/apr/network_io/beos poll.c sockets.c
               src/lib/apr/network_io/os2 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/threadproc/unix thread.c threadpriv.c
               src/lib/apr/threadproc/win32 thread.c threadpriv.c
  Log:
  const-ify the userdata interfaces
  
  Revision  Changes    Path
  1.30      +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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- fileacc.c	2000/07/03 12:06:28	1.29
  +++ fileacc.c	2000/07/08 11:15:48	1.30
  @@ -139,7 +139,7 @@
   }
   #endif
   
  -ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file)
  +ap_status_t ap_get_filedata(void **data, const char *key, ap_file_t *file)
   {    
       if (file != NULL) {
           return ap_get_userdata(data, key, file->cntxt);
  @@ -150,7 +150,7 @@
       }
   }
   
  -ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key,
  +ap_status_t ap_set_filedata(ap_file_t *file, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {    
       if (file != NULL) {
  
  
  
  1.60      +4 -4      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- apr_file_io.h	2000/07/07 02:15:59	1.59
  +++ apr_file_io.h	2000/07/08 11:15:48	1.60
  @@ -651,7 +651,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file)
  +=head1 ap_status_t ap_get_filedata(void **data, const char *key, ap_file_t *file)
   
   B<Return the data associated with the current file.>
   
  @@ -661,11 +661,11 @@
   
   =cut
    */                     
  -ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file);
  +ap_status_t ap_get_filedata(void **data, const char *key, ap_file_t *file);
   
   /*
   
  -=head1 ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key, ap_status_t
(*cleanup) (void *))
  +=head1 ap_status_t ap_set_filedata(ap_file_t *file, void *data, const char *key, ap_status_t
(*cleanup) (void *))
   
   B<Set the data associated with the current file.>
   
  @@ -676,7 +676,7 @@
   
   =cut
    */                     
  -ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key,
  +ap_status_t ap_set_filedata(ap_file_t *file, void *data, const char *key,
                               ap_status_t (*cleanup) (void *));
   
   /*
  
  
  
  1.38      +4 -4      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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apr_general.h	2000/06/27 21:35:29	1.37
  +++ apr_general.h	2000/07/08 11:15:48	1.38
  @@ -326,7 +326,7 @@
   
   /*
   
  -=head1 ap_status_t ap_set_userdata(void *data, char *key, ap_status_t (*cleanup) (void
*), ap_pool_t *cont)
  +=head1 ap_status_t ap_set_userdata(void *data, const char *key, ap_status_t (*cleanup)
(void *), ap_pool_t *cont)
   
   B<Set the data associated with the current pool>.
   
  @@ -346,13 +346,13 @@
   
   =cut
    */
  -ap_status_t ap_set_userdata(void *data, char *key, 
  +ap_status_t ap_set_userdata(void *data, const char *key, 
                               ap_status_t (*cleanup) (void *), 
                               ap_pool_t *cont);
   
   /*
   
  -=head1 ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
  +=head1 ap_status_t ap_get_userdata(void **data, const char *key, ap_pool_t *cont)
   
   B<Return the data associated with the current pool.>
   
  @@ -362,7 +362,7 @@
   
   =cut
    */
  -ap_status_t ap_get_userdata(void **, char *key, ap_pool_t *cont);
  +ap_status_t ap_get_userdata(void **, const char *key, ap_pool_t *cont);
   
   /*
   
  
  
  
  1.15      +4 -4      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_lock.h	2000/04/16 04:46:55	1.14
  +++ apr_lock.h	2000/07/08 11:15:48	1.15
  @@ -162,7 +162,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data)
  +=head1 ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
   
   B<Return the pool associated with the current lock.>
   
  @@ -172,11 +172,11 @@
   
   =cut
    */
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data);
  +ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data);
   
   /*
   
  -=head1 ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t
(*cleanup) (void *))
  +=head1 ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key, ap_status_t
(*cleanup) (void *))
   
   B<Return the pool associated with the current lock.>
   
  @@ -187,7 +187,7 @@
   
   =cut
    */
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
                               ap_status_t (*cleanup) (void *));
   
   #ifdef __cplusplus
  
  
  
  1.47      +8 -8      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- apr_network_io.h	2000/07/07 01:42:52	1.46
  +++ apr_network_io.h	2000/07/08 11:15:49	1.47
  @@ -274,7 +274,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock)
  +=head1 ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock)
   
   B<Return the pool associated with the current socket.>
   
  @@ -283,11 +283,11 @@
   
   =cut
    */
  -ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock);
  +ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock);
   
   /*
   
  -=head1 ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key, ap_status_t
(*cleanup) (void *))
  +=head1 ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key, ap_status_t
(*cleanup) (void *))
   
   B<Set the pool associated with the current socket.>
   
  @@ -298,7 +298,7 @@
   
   =cut
    */
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key,
  +ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
                                 ap_status_t (*cleanup) (void*));
   
   /*
  @@ -716,7 +716,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data)
  +=head1 ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
   
   B<Return the pool associated with the current poll.>
   
  @@ -726,11 +726,11 @@
   
   =cut
    */
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data);
  +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data);
   
   /*
   
  -=head1 ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key, ap_status_t
(*cleanup) (void *))
  +=head1 ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key, ap_status_t
(*cleanup) (void *))
   
   B<Return the pool associated with the current poll.>
   
  @@ -739,7 +739,7 @@
   
   =cut
    */
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
                               ap_status_t (*cleanup) (void *));
   
   /*
  
  
  
  1.39      +8 -8      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr_thread_proc.h	2000/06/20 19:16:09	1.38
  +++ apr_thread_proc.h	2000/07/08 11:15:49	1.39
  @@ -211,7 +211,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread)
  +=head1 ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread)
   
   B<Return the pool associated with the current thread.>
   
  @@ -221,11 +221,11 @@
   
   =cut
    */
  -ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread);
  +ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread);
   
   /*
   
  -=head1 ap_status_t ap_set_threaddata(void *data, char *key, ap_status_t (*cleanup) (void
*), ap_thread_t *thread)
  +=head1 ap_status_t ap_set_threaddata(void *data, const char *key, ap_status_t (*cleanup)
(void *), ap_thread_t *thread)
   
   B<Return the pool associated with the current thread.>
   
  @@ -236,7 +236,7 @@
   
   =cut
    */
  -ap_status_t ap_set_threaddata(void *data, char *key,
  +ap_status_t ap_set_threaddata(void *data, const char *key,
                                 ap_status_t (*cleanup) (void *), 
                                 ap_thread_t *thread);
   
  @@ -295,7 +295,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey)
  +=head1 ap_status_t ap_get_threadkeydata(void **data, const char *key, ap_threadkey_t *threadkey)
   
   B<Return the pool associated with the current threadkey.>
   
  @@ -305,11 +305,11 @@
   
   =cut
    */
  -ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey);
  +ap_status_t ap_get_threadkeydata(void **data, const char *key, ap_threadkey_t *threadkey);
   
   /*
   
  -=head1 ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void
*), ap_threadkey_t *threadkey)
  +=head1 ap_status_t ap_set_threadkeydata(void *data, const char *key, ap_status_t (*cleanup)
(void *), ap_threadkey_t *threadkey)
   
   B<Return the pool associated with the current threadkey.>
   
  @@ -320,7 +320,7 @@
   
   =cut
    */
  -ap_status_t ap_set_threadkeydata(void *data, char *key,
  +ap_status_t ap_set_threadkeydata(void *data, const char *key,
                                    ap_status_t (*cleanup) (void *), 
                                    ap_threadkey_t *threadkey);
   
  
  
  
  1.17      +2 -2      apache-2.0/src/lib/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- locks.c	2000/04/14 23:52:22	1.16
  +++ locks.c	2000/07/08 11:15:50	1.17
  @@ -146,7 +146,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -157,7 +157,7 @@
       }
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  
  
  
  1.35      +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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- locks.c	2000/06/22 00:36:00	1.34
  +++ locks.c	2000/07/08 11:15:50	1.35
  @@ -167,7 +167,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -178,7 +178,7 @@
       }
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- locks.c	2000/05/01 03:24:33	1.25
  +++ locks.c	2000/07/08 11:15:50	1.26
  @@ -154,7 +154,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -165,7 +165,7 @@
       }
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  
  
  
  1.34      +2 -2      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- start.c	2000/05/22 17:05:16	1.33
  +++ start.c	2000/07/08 11:15:51	1.34
  @@ -77,7 +77,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_userdata(void *data, char *key,
  +ap_status_t ap_set_userdata(void *data, const char *key,
                               ap_status_t (*cleanup) (void *),
                               ap_pool_t *cont)
   {
  @@ -109,7 +109,7 @@
       return APR_ENOPOOL;
   }
   
  -ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
  +ap_status_t ap_get_userdata(void **data, const char *key, ap_pool_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- poll.c	2000/06/13 16:44:29	1.18
  +++ poll.c	2000/07/08 11:15:51	1.19
  @@ -198,7 +198,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -209,7 +209,7 @@
       }
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  
  
  
  1.30      +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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- sockets.c	2000/06/26 20:37:37	1.29
  +++ sockets.c	2000/07/08 11:15:51	1.30
  @@ -190,7 +190,7 @@
       return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock)
  +ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock)
   {
       if (socket != NULL) {
           return ap_get_userdata(data, key, sock->cntxt);
  @@ -201,7 +201,7 @@
       }
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key,
  +ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       if (sock != NULL) {
  
  
  
  1.23      +3 -2      apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- sockets.c	2000/06/26 20:37:40	1.22
  +++ sockets.c	2000/07/08 11:15:51	1.23
  @@ -206,7 +206,8 @@
   
   
   
  -ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *socket)
  +ap_status_t ap_get_socketdata(void **data, const char *key,
  +                              ap_socket_t *socket)
   {
       if (socket != NULL) {
           return ap_get_userdata(data, key, socket->cntxt);
  @@ -219,7 +220,7 @@
   
   
   
  -ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, char *key,
  +ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, const char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       if (socket != NULL) {
  
  
  
  1.35      +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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- poll.c	2000/06/12 13:39:39	1.34
  +++ poll.c	2000/07/08 11:15:52	1.35
  @@ -357,7 +357,7 @@
   
   #endif 
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -368,7 +368,7 @@
       }
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  
  
  
  1.51      +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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- sockets.c	2000/06/28 22:36:28	1.50
  +++ sockets.c	2000/07/08 11:15:52	1.51
  @@ -231,12 +231,12 @@
       }
   }
   
  -ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock)
  +ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock)
   {
       return ap_get_userdata(data, key, sock->cntxt);
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key,
  +ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       return ap_set_userdata(data, key, cleanup, sock->cntxt);
  
  
  
  1.17      +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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- poll.c	2000/05/01 14:39:34	1.16
  +++ poll.c	2000/07/08 11:15:52	1.17
  @@ -193,7 +193,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -204,7 +204,7 @@
       }
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  
  
  
  1.33      +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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- sockets.c	2000/07/06 15:13:25	1.32
  +++ sockets.c	2000/07/08 11:15:52	1.33
  @@ -232,12 +232,12 @@
       }
   }
   
  -ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *socket)
  +ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *socket)
   {
       return ap_get_userdata(data, key, socket->cntxt);
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, char *key, 
  +ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, const char *key, 
                                 ap_status_t (*cleanup) (void *))
   {
       return ap_set_userdata(data, key, cleanup, socket->cntxt);
  
  
  
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- thread.c	2000/06/22 16:05:39	1.24
  +++ thread.c	2000/07/08 11:15:53	1.25
  @@ -184,7 +184,7 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread)
  +ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(data, key, thread->cntxt);
  @@ -195,7 +195,7 @@
       }
   }
   
  -ap_status_t ap_set_threaddata(void *data, char *key,
  +ap_status_t ap_set_threaddata(void *data, const char *key,
                                 ap_status_t (*cleanup) (void *),
                                 ap_thread_t *thread)
   {
  
  
  
  1.22      +4 -3      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- threadpriv.c	2000/06/22 16:05:39	1.21
  +++ threadpriv.c	2000/07/08 11:15:53	1.22
  @@ -108,7 +108,8 @@
       return stat;
   }
   
  -ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey)
  +ap_status_t ap_get_threadkeydata(void **data, const char *key,
  +                                 ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(data, key, threadkey->cntxt);
  @@ -119,8 +120,8 @@
       }
   }
   
  -ap_status_t ap_set_threadkeydata(void *data,
  -                                 char *key, ap_status_t (*cleanup) (void *),
  +ap_status_t ap_set_threadkeydata(void *data, const char *key,
  +                                 ap_status_t (*cleanup) (void *),
                                    ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- thread.c	2000/05/26 16:23:35	1.19
  +++ thread.c	2000/07/08 11:15:53	1.20
  @@ -156,7 +156,7 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread)
  +ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(data, key, thread->cntxt);
  @@ -167,7 +167,7 @@
       }
   }
   
  -ap_status_t ap_set_threaddata(void *data, char *key,
  +ap_status_t ap_set_threaddata(void *data, const char *key,
                                 ap_status_t (*cleanup) (void *),
                                 ap_thread_t *thread)
   {
  
  
  
  1.16      +4 -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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- threadpriv.c	2000/05/01 03:24:35	1.15
  +++ threadpriv.c	2000/07/08 11:15:53	1.16
  @@ -92,7 +92,8 @@
       return GetLastError();
   }
   
  -ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey)
  +ap_status_t ap_get_threadkeydata(void **data, const char *key,
  +                                 ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(data, key, threadkey->cntxt);
  @@ -103,7 +104,8 @@
       }
   }
   
  -ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void *),

  +ap_status_t ap_set_threadkeydata(void *data, const char *key,
  +                                 ap_status_t (*cleanup) (void *), 
                                    ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
  
  
  

Mime
View raw message