httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/locks/win32 locks.c
Date Fri, 14 Apr 2000 01:56:26 GMT
trawick     00/04/13 18:56:25

  Modified:    src/lib/apr/include apr_lock.h
               src/lib/apr/locks/beos crossproc.c 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
  Log:
  Change the fname parm of ap_create_lock() and ap_child_init_lock()
  from char * to const char *.  This eliminates a compile warning
  in mod_rewrite and feels better anyway.
  
  Revision  Changes    Path
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_lock.h	2000/04/14 01:38:40	1.10
  +++ apr_lock.h	2000/04/14 01:56:23	1.11
  @@ -71,7 +71,7 @@
   /*   Function definitions */
   /* ***APRDOC********************************************************
    * ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
  - *                            ap_lockscope_e scope, char *fname, 
  + *                            ap_lockscope_e scope, const char *fname, 
    *                            ap_context_t *cont)
    *    Create a new instance of a lock structure. 
    * arg 1) The newly created lock structure.
  @@ -91,7 +91,7 @@
    *        only guaranteed to lock processes.
    */
   ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, char *fname, 
  +                           ap_lockscope_e scope, const char *fname, 
                              ap_context_t *cont);
   
   /* ***APRDOC********************************************************
  @@ -118,7 +118,7 @@
   ap_status_t ap_destroy_lock(ap_lock_t *lock);
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, 
  + * ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
    *                                ap_context_t *cont)
    *    Re-open a lock in a child process. 
    * arg 1) The newly re-opened lock structure.
  @@ -132,7 +132,7 @@
    *        idea to call it regardless, because it makes the code more
    *        portable. 
    */
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, 
  +ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
                                  ap_context_t *cont);
   
   /* ***APRDOC********************************************************
  
  
  
  1.12      +2 -1      apache-2.0/src/lib/apr/locks/beos/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- crossproc.c	2000/04/03 19:44:46	1.11
  +++ crossproc.c	2000/04/14 01:56:23	1.12
  @@ -123,7 +123,8 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
  +                            const char *fname)
   {
       return APR_SUCCESS;
   }
  
  
  
  1.14      +3 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- locks.c	2000/04/03 19:44:46	1.13
  +++ locks.c	2000/04/14 01:56:23	1.14
  @@ -55,7 +55,7 @@
   #include "locks.h"
   
   ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, char *fname, 
  +                           ap_lockscope_e scope, const char *fname, 
                              ap_context_t *cont)
   {
       ap_lock_t *new;
  @@ -134,7 +134,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
  +                               ap_context_t *cont)
   {
       ap_status_t stat;
       if ((*lock)->scope != APR_CROSS_PROCESS) {
  
  
  
  1.13      +4 -3      apache-2.0/src/lib/apr/locks/os2/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- locks.c	2000/04/08 06:58:41	1.12
  +++ locks.c	2000/04/14 01:56:24	1.13
  @@ -77,7 +77,8 @@
   
   
   
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope,
char *fname, ap_context_t *cont)
  +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope,

  +                           const char *fname, ap_context_t *cont)
   {
       ap_lock_t *new;
       ULONG rc;
  @@ -109,7 +110,7 @@
   
   
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, ap_context_t *cont)
   {
       int rc;
       PIB *ppib;
  @@ -122,7 +123,7 @@
       DosGetInfoBlocks(&((*lock)->tib), &ppib);
       (*lock)->owner = 0;
       (*lock)->lock_count = 0;
  -    rc = DosOpenMutexSem( fname, &(*lock)->hMutex );
  +    rc = DosOpenMutexSem( (char *)fname, &(*lock)->hMutex );
   
       if (!rc)
           ap_register_cleanup(cont, *lock, lock_cleanup, ap_null_cleanup);
  
  
  
  1.25      +8 -4      apache-2.0/src/lib/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- crossproc.c	2000/04/05 21:44:43	1.24
  +++ crossproc.c	2000/04/14 01:56:24	1.25
  @@ -129,7 +129,8 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
  +                            const char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -228,7 +229,8 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
  +                            const char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -307,7 +309,8 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
  +                            const char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -372,7 +375,8 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
  +                            const char *fname)
   {
       ap_lock_t *new;
   
  
  
  
  1.26      +3 -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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- locks.c	2000/04/14 01:38:42	1.25
  +++ locks.c	2000/04/14 01:56:24	1.26
  @@ -56,7 +56,7 @@
   #include "apr_portable.h"
   
   ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, char *fname, 
  +                           ap_lockscope_e scope, const char *fname, 
                              ap_context_t *cont)
   {
       ap_lock_t *new;
  @@ -159,7 +159,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
  +                               ap_context_t *cont)
   {
       ap_status_t stat;
       if ((*lock)->scope != APR_CROSS_PROCESS) {
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- locks.h	2000/04/03 18:37:17	1.16
  +++ locks.h	2000/04/14 01:56:24	1.17
  @@ -151,7 +151,7 @@
   ap_status_t destroy_inter_lock(struct ap_lock_t *lock);
   
   ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, 
  -                            char *fname);
  +                            const char *fname);
   
   #endif  /* LOCKS_H */
   
  
  
  
  1.17      +3 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- locks.c	2000/04/03 19:44:52	1.16
  +++ locks.c	2000/04/14 01:56:25	1.17
  @@ -58,7 +58,7 @@
   #include "apr_portable.h"
   
   ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, char *fname, 
  +                           ap_lockscope_e scope, const char *fname, 
                              ap_context_t *cont)
   {
       ap_lock_t *newlock;
  @@ -92,7 +92,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
  +                               ap_context_t *cont)
   {
       /* This routine should not be called (and OpenMutex will fail if called) 
        * on a INTRAPROCESS lock
  
  
  

Mime
View raw message