rbb 99/10/08 11:53:31
Modified: src/lib/apr/locks/beos locks.c
src/lib/apr/locks/os2 locks.c
src/lib/apr/locks/unix locks.c
src/lib/apr/locks/win32 locks.c
Log:
Parameter order change for the locks directory. They are all up to
APR's current argument order spec.
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locks.c 1999/10/08 11:33:28 1.3
+++ locks.c 1999/10/08 18:53:22 1.4
@@ -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;
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locks.c 1999/10/04 16:36:57 1.2
+++ locks.c 1999/10/08 18:53:27 1.3
@@ -70,7 +70,7 @@
-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;
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locks.c 1999/10/04 16:36:58 1.5
+++ locks.c 1999/10/08 18:53:28 1.6
@@ -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 @@
* 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) {
1.7 +4 -4 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- locks.c 1999/10/08 17:38:24 1.6
+++ locks.c 1999/10/08 18:53:29 1.7
@@ -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 @@
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_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;
