diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_general.h | 10 | ||||
| -rw-r--r-- | include/apr_getopt.h | 4 | ||||
| -rw-r--r-- | include/apr_lock.h | 18 | ||||
| -rw-r--r-- | include/apr_portable.h | 5 |
4 files changed, 21 insertions, 16 deletions
diff --git a/include/apr_general.h b/include/apr_general.h index 33a0b4460..9a9e60dc5 100644 --- a/include/apr_general.h +++ b/include/apr_general.h @@ -220,13 +220,15 @@ typedef int ap_signum_t; /* Context functions */ -ap_status_t ap_create_context(ap_context_t **, ap_context_t *); +ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont); ap_status_t ap_destroy_context(struct context_t *cont); ap_status_t ap_exit(ap_context_t *); -ap_status_t ap_set_userdata(void *, char *, - ap_status_t (*cleanup) (void *), ap_context_t *); -ap_status_t ap_get_userdata(void **, char *, ap_context_t *); +ap_status_t ap_set_userdata(void *data, char *key, + ap_status_t (*cleanup) (void *), + ap_context_t *cont); +ap_status_t ap_get_userdata(void **, char *key, ap_context_t *cont); ap_status_t ap_initialize(void); +ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_context_t *cont); #ifdef __cplusplus } diff --git a/include/apr_getopt.h b/include/apr_getopt.h index c78829ef9..b05cd0670 100644 --- a/include/apr_getopt.h +++ b/include/apr_getopt.h @@ -64,8 +64,8 @@ API_VAR_IMPORT int API_VAR_IMPORT char * ap_optarg; /* argument associated with option */ -ap_status_t ap_getopt(ap_context_t *, ap_int32_t, char *const *, const char *, - ap_int32_t *); +ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, + ap_int32_t *rv, ap_context_t *cont); #endif /* ! APR_GETOPT_H */ diff --git a/include/apr_lock.h b/include/apr_lock.h index 530fe57a6..550da3825 100644 --- a/include/apr_lock.h +++ b/include/apr_lock.h @@ -70,15 +70,17 @@ typedef enum {APR_MUTEX, APR_READWRITE} ap_locktype_e; typedef struct lock_t ap_lock_t; /* Function definitions */ -ap_status_t ap_create_lock(ap_lock_t **, ap_locktype_e, ap_lockscope_e, - char *, ap_context_t *); -ap_status_t ap_lock(ap_lock_t *); -ap_status_t ap_unlock(ap_lock_t *); -ap_status_t ap_destroy_lock(ap_lock_t *); -ap_status_t ap_child_init_lock(ap_lock_t **, char *, ap_context_t *); +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_lock(ap_lock_t *lock); +ap_status_t ap_unlock(ap_lock_t *lock); +ap_status_t ap_destroy_lock(ap_lock_t *lock); +ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, + ap_context_t *cont); -ap_status_t ap_get_lockdata(ap_lock_t *, char *, void *); -ap_status_t ap_set_lockdata(ap_lock_t *, void *, char *, +ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data); +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t (*cleanup) (void *)); #ifdef __cplusplus diff --git a/include/apr_portable.h b/include/apr_portable.h index 167d3dd36..45495791a 100644 --- a/include/apr_portable.h +++ b/include/apr_portable.h @@ -182,7 +182,7 @@ typedef struct tm ap_os_exp_time_t; ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file); ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir); ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *); -ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t *); +ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock); ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *); ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *); ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **, ap_time_t *); @@ -196,7 +196,8 @@ ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont); ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_sock_t *, ap_context_t *); -ap_status_t ap_put_os_lock(ap_lock_t **, ap_os_lock_t *, ap_context_t *); +ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, + ap_context_t *cont); ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *); ap_status_t ap_put_os_imp_time(ap_time_t *, ap_os_imp_time_t **, ap_context_t *); ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_context_t *); |