httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
Date Wed, 19 Apr 2000 21:17:42 GMT
rbb         00/04/19 14:17:42

  Modified:    src/lib/apr/file_io/win32 dir.c open.c
               src/lib/apr/include apr_errno.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 sockets.c
               src/lib/apr/network_io/os2 sockets.c
               src/lib/apr/network_io/unix sockets.c
               src/lib/apr/network_io/win32 sockets.c
               src/lib/apr/threadproc/beos proc.c
               src/lib/apr/threadproc/unix proc.c thread.c threadpriv.c
               src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
  Log:
  APR_ENOCONT doesn't make any sense without contexts.  Replaced them all with
  APR_ENOPOOL
  
  Revision  Changes    Path
  1.21      +1 -1      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- dir.c	2000/04/18 13:57:29	1.20
  +++ dir.c	2000/04/19 21:17:26	1.21
  @@ -213,7 +213,7 @@
   ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*dir) == NULL) {
           (*dir) = (ap_dir_t *)ap_pcalloc(cont, sizeof(ap_dir_t));
  
  
  
  1.33      +1 -1      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- open.c	2000/04/19 17:42:07	1.32
  +++ open.c	2000/04/19 21:17:27	1.33
  @@ -199,7 +199,7 @@
   {
       if ((*file) == NULL) {
           if (cont == NULL) {
  -            return APR_ENOCONT;
  +            return APR_ENOPOOL;
           }
           (*file) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
           (*file)->cntxt = cont;
  
  
  
  1.24      +0 -1      apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_errno.h	2000/04/08 06:58:41	1.23
  +++ apr_errno.h	2000/04/19 21:17:31	1.24
  @@ -89,7 +89,6 @@
   #define APR_ENOPOOL        (APR_OS_START_ERROR + 2)
   #define APR_ENOFILE        (APR_OS_START_ERROR + 3)
   #define APR_EBADDATE       (APR_OS_START_ERROR + 4)
  -#define APR_ENOCONT        (APR_OS_START_ERROR + 5)
   #define APR_ENOPROC        (APR_OS_START_ERROR + 6)
   #define APR_ENOTIME        (APR_OS_START_ERROR + 7)
   #define APR_ENODIR         (APR_OS_START_ERROR + 8)
  
  
  
  1.30      +1 -1      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- locks.c	2000/04/14 23:52:23	1.29
  +++ locks.c	2000/04/19 21:17:32	1.30
  @@ -213,7 +213,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*lock) == NULL) {
           (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  
  
  
  1.22      +1 -1      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- locks.c	2000/04/19 18:47:22	1.21
  +++ locks.c	2000/04/19 21:17:33	1.22
  @@ -190,7 +190,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*lock) == NULL) {
           (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  
  
  
  1.17      +2 -2      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- start.c	2000/04/14 15:58:31	1.16
  +++ start.c	2000/04/19 21:17:34	1.17
  @@ -114,7 +114,7 @@
           ap_register_cleanup(cont, dptr->data, cleanup, cleanup);
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
  @@ -136,7 +136,7 @@
           }
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   ap_status_t ap_initialize(void)
  
  
  
  1.29      +3 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- start.c	2000/04/14 15:58:32	1.28
  +++ start.c	2000/04/19 21:17:35	1.29
  @@ -116,7 +116,7 @@
           ap_register_cleanup(cont, dptr->data, cleanup, cleanup);
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
  @@ -138,7 +138,7 @@
           }
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   ap_status_t ap_initialize(void)
  @@ -159,7 +159,7 @@
   ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       else {
           cont->apr_abort = apr_abort;
  
  
  
  1.25      +2 -2      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- start.c	2000/04/14 16:50:26	1.24
  +++ start.c	2000/04/19 21:17:35	1.25
  @@ -198,7 +198,7 @@
           ap_register_cleanup(cont, dptr->data, cleanup, cleanup);
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
  @@ -220,7 +220,7 @@
           }
           return APR_SUCCESS;
       }
  -    return APR_ENOCONT;
  +    return APR_ENOPOOL;
   }
   
   /* This is the helper code to resolve late bound entry points 
  
  
  
  1.23      +1 -1      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- sockets.c	2000/04/14 15:58:36	1.22
  +++ sockets.c	2000/04/19 21:17:36	1.23
  @@ -222,7 +222,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
           (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  
  
  
  1.18      +1 -1      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- sockets.c	2000/04/14 15:58:37	1.17
  +++ sockets.c	2000/04/19 21:17:37	1.18
  @@ -243,7 +243,7 @@
   ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
           (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  
  
  
  1.39      +1 -1      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- sockets.c	2000/04/14 15:58:40	1.38
  +++ sockets.c	2000/04/19 21:17:38	1.39
  @@ -234,7 +234,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
           (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- sockets.c	2000/04/14 15:58:41	1.25
  +++ sockets.c	2000/04/19 21:17:39	1.26
  @@ -262,7 +262,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
           (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  
  
  
  1.23      +1 -1      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- proc.c	2000/04/14 15:58:47	1.22
  +++ proc.c	2000/04/19 21:17:40	1.23
  @@ -371,7 +371,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*proc) == NULL) {
           (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t));
  
  
  
  1.24      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- proc.c	2000/04/17 19:57:29	1.23
  +++ proc.c	2000/04/19 21:17:40	1.24
  @@ -366,7 +366,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*proc) == NULL) {
           (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t));
  
  
  
  1.18      +1 -1      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- thread.c	2000/04/14 15:58:50	1.17
  +++ thread.c	2000/04/19 21:17:40	1.18
  @@ -105,7 +105,7 @@
                                ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*thd) == NULL) {
           (*thd) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  
  
  
  1.17      +1 -1      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- threadpriv.c	2000/04/14 15:58:50	1.16
  +++ threadpriv.c	2000/04/19 21:17:40	1.17
  @@ -139,7 +139,7 @@
                                   ap_os_threadkey_t *thekey, ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*key) == NULL) {
           (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
  
  
  
  1.23      +1 -1      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- proc.c	2000/04/14 15:58:52	1.22
  +++ proc.c	2000/04/19 21:17:41	1.23
  @@ -443,7 +443,7 @@
                              ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*proc) == NULL) {
           (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t));
  
  
  
  1.16      +1 -1      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- thread.c	2000/04/14 15:58:52	1.15
  +++ thread.c	2000/04/19 21:17:41	1.16
  @@ -193,7 +193,7 @@
                                ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*thd) == NULL) {
           (*thd) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- threadpriv.c	2000/04/14 15:58:52	1.13
  +++ threadpriv.c	2000/04/19 21:17:41	1.14
  @@ -126,7 +126,7 @@
                                   ap_os_threadkey_t *thekey, ap_pool_t *cont)
   {
       if (cont == NULL) {
  -        return APR_ENOCONT;
  +        return APR_ENOPOOL;
       }
       if ((*key) == NULL) {
           (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
  
  
  

Mime
View raw message