Parameter order change for the locks directory. They are all up to

APR's current argument order spec.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59292 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 10 deletions

diff --git a/locks/beos/locks.c b/locks/beos/locks.c
index 7e490b72e..070b5c7ec 100644
--- a/locks/beos/locks.c
+++ b/locks/beos/locks.c
@@ -59,9 +59,9 @@
 #include <strings.h>
 #include <stdio.h>
 
-ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, 
+ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
                            ap_lockscope_e scope, char *fname, 
-                           struct lock_t **lock)
+                           ap_context_t *cont)
 {
     struct lock_t *new;
     ap_status_t stat;
diff --git a/locks/os2/locks.c b/locks/os2/locks.c
index a2e46eed3..69d69dc05 100644
--- a/locks/os2/locks.c
+++ b/locks/os2/locks.c
@@ -70,7 +70,7 @@ ap_status_t lock_cleanup(void *thelock)
 
 
 
-ap_status_t ap_create_lock(struct lock_t **lock, ap_context_t *cont, ap_locktype_e type, char *fname)
+ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, char *fname, ap_context_t *cont)
 {
     struct lock_t *new;
     ULONG rc;
diff --git a/locks/unix/locks.c b/locks/unix/locks.c
index dbec87aae..64f0adc50 100644
--- a/locks/unix/locks.c
+++ b/locks/unix/locks.c
@@ -76,9 +76,9 @@
  * NOTE:  APR_CROSS_PROCESS may lock both processes and threads, but it is
  *        only garaunteed to lock processes.
  */
-ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, 
+ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
                            ap_lockscope_e scope, char *fname, 
-                           struct lock_t **lock)
+                           ap_context_t *cont)
 {
     struct lock_t *new;
     ap_status_t stat;
@@ -183,7 +183,7 @@ ap_status_t ap_destroy_lock(struct lock_t *lock)
  *        idea to call it regardless, because it makes the code more
  *        portable. 
  */
-ap_status_t ap_child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
+ap_status_t ap_child_init_lock(struct lock_t **lock, char *fname, ap_context_t *cont)
 {
     ap_status_t stat;
     if ((*lock)->type != APR_CROSS_PROCESS) {
diff --git a/locks/win32/locks.c b/locks/win32/locks.c
index bceee4945..d3991a4f2 100644
--- a/locks/win32/locks.c
+++ b/locks/win32/locks.c
@@ -58,9 +58,9 @@
 #include "locks.h"
 #include "apr_portable.h"
 
-ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, 
+ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
                            ap_lockscope_e scope, char *fname, 
-                           struct lock_t **lock)
+                           ap_context_t *cont)
 {
     struct lock_t *newlock;
     SECURITY_ATTRIBUTES sec;
@@ -96,7 +96,7 @@ ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type,
     return APR_SUCCESS;
 }
 
-ap_status_t ap_child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
+ap_status_t ap_child_init_lock(struct lock_t **lock, char *fname, ap_context_t *cont)
 {
     /* This routine should not be called (and OpenMutex will fail if called) 
      * on a INTRAPROCESS lock
@@ -187,7 +187,7 @@ ap_status_t ap_set_lockdata(struct lock_t *lock, void *data, char *key,
     }
 }
 
-ap_status_t ap_get_os_lock(struct lock_t *lock, ap_os_lock_t *thelock)
+ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, struct lock_t *lock)
 {
     if (lock == NULL) {
         return APR_ENOFILE;