From c22cf7f831deced25759629459531df54eeeb6c0 Mon Sep 17 00:00:00 2001 From: rbb Date: Mon, 3 Apr 2000 19:45:36 +0000 Subject: Finish the APR naming cleanup. This removes the struct's from apr_variable declarations. This works on Unix, but a test compile on other platforms would be a good idea. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59773 13f79535-47bb-0310-9956-ffa450edef68 --- locks/beos/crossproc.c | 2 +- locks/beos/intraproc.c | 2 +- locks/beos/locks.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'locks/beos') diff --git a/locks/beos/crossproc.c b/locks/beos/crossproc.c index e85e0a7bd..264503a04 100644 --- a/locks/beos/crossproc.c +++ b/locks/beos/crossproc.c @@ -123,7 +123,7 @@ ap_status_t destroy_inter_lock(ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { return APR_SUCCESS; } diff --git a/locks/beos/intraproc.c b/locks/beos/intraproc.c index d1a1f538c..89bfc17bc 100644 --- a/locks/beos/intraproc.c +++ b/locks/beos/intraproc.c @@ -68,7 +68,7 @@ ap_status_t lock_intra_cleanup(void *data) return APR_SUCCESS; } -ap_status_t create_intra_lock(struct ap_lock_t *new) +ap_status_t create_intra_lock(ap_lock_t *new) { int32 stat; new->sem_intraproc = (sem_id)ap_palloc(new->cntxt, sizeof(sem_id)); diff --git a/locks/beos/locks.c b/locks/beos/locks.c index 3bc544756..f3a4b7dc5 100644 --- a/locks/beos/locks.c +++ b/locks/beos/locks.c @@ -54,14 +54,14 @@ #include "locks.h" -ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) { - struct ap_lock_t *new; + ap_lock_t *new; ap_status_t stat; - new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); if (new == NULL){ return APR_ENOMEM; } @@ -134,7 +134,7 @@ ap_status_t ap_destroy_lock(ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont) +ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont) { ap_status_t stat; if ((*lock)->scope != APR_CROSS_PROCESS) { @@ -145,7 +145,7 @@ ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_ return APR_SUCCESS; } -ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) +ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data) { if (lock != NULL) { return ap_get_userdata(data, key, lock->cntxt); @@ -156,7 +156,7 @@ ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) } } -ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (lock != NULL) { -- cgit v1.2.1