diff options
| author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-10-08 20:04:44 +0000 |
|---|---|---|
| committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-10-08 20:04:44 +0000 |
| commit | 31c684922fabfd7c4856df54f0dce3b23a5294fc (patch) | |
| tree | 4b6fcb7f55f3b32b3867060cdd322a873980c359 /misc | |
| parent | df352404dcedbf55619d7ad08a9d0c996b6bbd8e (diff) | |
| download | libapr-31c684922fabfd7c4856df54f0dce3b23a5294fc.tar.gz | |
Bring the misc code up to the APR parameter order spec. This also fixes a few
files I missed when doing the locks argument ordering fixes.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/beos/start.c | 7 | ||||
| -rw-r--r-- | misc/unix/start.c | 7 | ||||
| -rw-r--r-- | misc/win32/start.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/misc/beos/start.c b/misc/beos/start.c index 626f72975..597cf968e 100644 --- a/misc/beos/start.c +++ b/misc/beos/start.c @@ -99,8 +99,9 @@ ap_status_t ap_destroy_context(ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, - ap_status_t (*cleanup) (void *)) +ap_status_t ap_set_userdata(void *data, char *key, + ap_status_t (*cleanup) (void *), + struct context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -130,7 +131,7 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, return APR_ENOCONT; } -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key) +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont) { datastruct *dptr = NULL; if (cont) { diff --git a/misc/unix/start.c b/misc/unix/start.c index cf2c1e24d..16d814d00 100644 --- a/misc/unix/start.c +++ b/misc/unix/start.c @@ -132,8 +132,9 @@ ap_status_t ap_destroy_context(struct context_t *cont) * It is advised that steps are taken to ensure that a unique * key is used at all times. */ -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, - ap_status_t (*cleanup) (void *)) +ap_status_t ap_set_userdata(void *data, char *key, + ap_status_t (*cleanup) (void *), + struct context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -170,7 +171,7 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, * arg 2) The key for the data to retrieve * arg 3) The user data associated with the context. */ -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key) +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont) { datastruct *dptr = NULL; if (cont) { diff --git a/misc/win32/start.c b/misc/win32/start.c index d12adc0bb..cfe754be2 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -146,8 +146,9 @@ ap_status_t ap_get_oslevel(ap_context_t *cont, ap_oslevel_e *level) return APR_EEXIST; } -ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, - ap_status_t (*cleanup) (void *)) +ap_status_t ap_set_userdata(void *data, char *key, + ap_status_t (*cleanup) (void *), + struct context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -177,7 +178,7 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key, return APR_ENOCONT; } -ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key) +ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont) { datastruct *dptr = NULL; if (cont) { |