diff options
| -rw-r--r-- | include/http_config.h | 18 | ||||
| -rw-r--r-- | include/http_connection.h | 4 | ||||
| -rw-r--r-- | include/http_core.h | 14 | ||||
| -rw-r--r-- | include/http_log.h | 4 | ||||
| -rw-r--r-- | include/http_protocol.h | 8 | ||||
| -rw-r--r-- | include/http_request.h | 14 |
6 files changed, 31 insertions, 31 deletions
diff --git a/include/http_config.h b/include/http_config.h index 78ba9de081..4122b5d26a 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -469,8 +469,8 @@ AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val); * @return An error string or NULL on success * @deffunc const char *ap_set_string_slot(cmd_parms *cmd, void *struct_ptr, const char *arg) */ -AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *, void *, - const char *); +AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd, void *struct_ptr, + const char *arg); /** * Return true if the specified method is limited by being listed in @@ -494,8 +494,8 @@ AP_DECLARE(int) ap_method_is_limited(cmd_parms *cmd, const char *method); * @return An error string or NULL on success * @deffunc const char *ap_set_string_slot_lower(cmd_parms *cmd, void *struct_ptr, const char *arg) */ -AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *, - void *, const char *); +AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd, + void *struct_ptr, const char *arg); /** * Generic command handling function for flags * @param cmd The command parameters for this directive @@ -504,7 +504,7 @@ AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *, * @return An error string or NULL on success * @deffunc const char *ap_set_flag_slot(cmd_parms *cmd, void *struct_ptr, int arg) */ -AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int); +AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd, void *struct_ptr, int arg); /** * Generic command handling function for files * @param cmd The command parameters for this directive @@ -513,7 +513,7 @@ AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int); * @return An error string or NULL on success * @deffunc const char *ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, const char *arg) */ -AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *, void *, const char *); +AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, const char *arg); /** * For modules which need to read config files, open logs, etc. ... @@ -589,7 +589,7 @@ AP_DECLARE(module *) ap_find_linked_module(const char *name); * @param name the name of the file to open * @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name) */ -AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **, apr_pool_t *p, const char *name); +AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name); /** * Allocate a configfile_t handle with user defined functions and params @@ -951,7 +951,7 @@ AP_CORE_DECLARE(void *) ap_set_config_vectors(cmd_parms *parms, void *config, mo * @return OK or DECLINED * @deffunc int ap_run_header_parser(request_rec *r) */ -AP_DECLARE_HOOK(int,header_parser,(request_rec *)) +AP_DECLARE_HOOK(int,header_parser,(request_rec *r)) /** * Run the pre_config function for each module @@ -999,7 +999,7 @@ AP_DECLARE_HOOK(void,child_init,(apr_pool_t *pchild, server_rec *s)) * @tip non-wildcard handlers should HOOK_MIDDLE, wildcard HOOK_LAST * @deffunc void ap_run_handler(request_rec *r) */ -AP_DECLARE_HOOK(int,handler,(request_rec *)) +AP_DECLARE_HOOK(int,handler,(request_rec *r)) /** * Retrieve the optional functions for each module. diff --git a/include/http_connection.h b/include/http_connection.h index 1af06390a3..82c3135e6e 100644 --- a/include/http_connection.h +++ b/include/http_connection.h @@ -129,7 +129,7 @@ void ap_lingering_close(conn_rec *); * @return OK or DECLINED * @deffunc int ap_run_pre_connection(conn_rec *c) */ -AP_DECLARE_HOOK(int,pre_connection,(conn_rec *)) +AP_DECLARE_HOOK(int,pre_connection,(conn_rec *c)) /** * This hook implements different protocols. After a connection has been @@ -140,7 +140,7 @@ AP_DECLARE_HOOK(int,pre_connection,(conn_rec *)) * @return OK or DECLINED * @deffunc int ap_run_process_connection(conn_rec *c) */ -AP_DECLARE_HOOK(int,process_connection,(conn_rec *)) +AP_DECLARE_HOOK(int,process_connection,(conn_rec *c)) #ifdef __cplusplus } diff --git a/include/http_core.h b/include/http_core.h index 44dadeea87..7ac253f868 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -137,21 +137,21 @@ extern "C" { * @return the Options bitmask * @deffunc int ap_allow_options(request_rec *r) */ -AP_DECLARE(int) ap_allow_options (request_rec *); +AP_DECLARE(int) ap_allow_options (request_rec *r); /** * Retrieve the value of the AllowOverride for this request * @param r The current request * @return the overrides bitmask * @deffunc int ap_allow_overrides(request_rec *r) */ -AP_DECLARE(int) ap_allow_overrides (request_rec *); +AP_DECLARE(int) ap_allow_overrides (request_rec *r); /** * Retrieve the value of the DefaultType directive, or text/plain if not set * @param r The current request * @return The default type * @deffunc const char *ap_default_type(request_rec *r) */ -AP_DECLARE(const char *) ap_default_type (request_rec *); +AP_DECLARE(const char *) ap_default_type (request_rec *r); /** * Retrieve the document root for this server * @param r The current request @@ -160,7 +160,7 @@ AP_DECLARE(const char *) ap_default_type (request_rec *); * @return The document root * @deffunc const char *ap_document_root(request_rec *r) */ -AP_DECLARE(const char *) ap_document_root (request_rec *); +AP_DECLARE(const char *) ap_document_root (request_rec *r); /** * Lookup the remote client's DNS name or IP address * @param conn The current connection @@ -274,14 +274,14 @@ struct require_line { * @return The authorization required * @deffunc const char *ap_auth_type(request_rec *r) */ -AP_DECLARE(const char *) ap_auth_type (request_rec *); +AP_DECLARE(const char *) ap_auth_type (request_rec *r); /** * Return the current Authorization realm * @param r The current request * @return The current authorization realm * @deffunc const char *ap_auth_name(request_rec *r) */ -AP_DECLARE(const char *) ap_auth_name (request_rec *); +AP_DECLARE(const char *) ap_auth_name (request_rec *r); /** * How the requires lines must be met. * @param r The current request @@ -300,7 +300,7 @@ AP_DECLARE(int) ap_satisfies (request_rec *r); * @return An array of all requires directives for this request * @deffunc const apr_array_header_t *ap_requires(request_rec *r) */ -AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *); +AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *r); #if defined(WIN32) /* diff --git a/include/http_log.h b/include/http_log.h index 10edf0dcd4..322f83ffc8 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -213,7 +213,7 @@ AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level, * @param s The current server * @deffunc void ap_error_log2stderr(server_rec *s) */ -AP_DECLARE(void) ap_error_log2stderr (server_rec *); +AP_DECLARE(void) ap_error_log2stderr (server_rec *s); /** * Log the current pid of the parent process @@ -257,7 +257,7 @@ AP_DECLARE(piped_log *) ap_open_piped_log (apr_pool_t *p, const char *program); * @param pl The piped log structure * @deffunc void ap_close_piped_log(piped_log *pl) */ -AP_DECLARE(void) ap_close_piped_log (piped_log *); +AP_DECLARE(void) ap_close_piped_log (piped_log *pl); /** * A macro to access the read side of the piped log pipe diff --git a/include/http_protocol.h b/include/http_protocol.h index f1231ddcee..8071e91a43 100644 --- a/include/http_protocol.h +++ b/include/http_protocol.h @@ -527,7 +527,7 @@ AP_DECLARE(const char *) ap_method_name_of(int methnum); * @return OK or DECLINED * @deffunc ap_run_post_read_request(request_rec *r) */ -AP_DECLARE_HOOK(int,post_read_request,(request_rec *)) +AP_DECLARE_HOOK(int,post_read_request,(request_rec *r)) /** * This hook allows modules to perform any module-specific logging activities * over and above the normal server things. @@ -535,7 +535,7 @@ AP_DECLARE_HOOK(int,post_read_request,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_log_transaction(request_rec *r) */ -AP_DECLARE_HOOK(int,log_transaction,(request_rec *)) +AP_DECLARE_HOOK(int,log_transaction,(request_rec *r)) /** * This hook allows modules to retrieve the http method from a request. This * allows Apache modules to easily extend the methods that Apache understands @@ -543,14 +543,14 @@ AP_DECLARE_HOOK(int,log_transaction,(request_rec *)) * @return The http method from the request * @deffunc const char *ap_run_http_method(const request_rec *r) */ -AP_DECLARE_HOOK(const char *,http_method,(const request_rec *)) +AP_DECLARE_HOOK(const char *,http_method,(const request_rec *r)) /** * Return the default port from the current request * @param r The current request * @return The current port * @deffunc apr_port_t ap_run_default_port(const request_rec *r) */ -AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *)) +AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *r)) typedef struct ap_bucket_error ap_bucket_error; /** diff --git a/include/http_request.h b/include/http_request.h index 911438a2f4..ac8d308863 100644 --- a/include/http_request.h +++ b/include/http_request.h @@ -249,7 +249,7 @@ AP_DECLARE(void) ap_die(int type, request_rec *r); * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_translate_name(request_rec *r) */ -AP_DECLARE_HOOK(int,translate_name,(request_rec *)) +AP_DECLARE_HOOK(int,translate_name,(request_rec *r)) /** * This hook allows modules to check the authentication information sent with @@ -258,7 +258,7 @@ AP_DECLARE_HOOK(int,translate_name,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_check_user_id(request_rec *r) */ -AP_DECLARE_HOOK(int,check_user_id,(request_rec *)) +AP_DECLARE_HOOK(int,check_user_id,(request_rec *r)) /** * Allows modules to perform module-specific fixing of header fields. This @@ -267,7 +267,7 @@ AP_DECLARE_HOOK(int,check_user_id,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_fixups(request_rec *r) */ -AP_DECLARE_HOOK(int,fixups,(request_rec *)) +AP_DECLARE_HOOK(int,fixups,(request_rec *r)) /** * This routine is called to determine and/or set the various document type @@ -277,7 +277,7 @@ AP_DECLARE_HOOK(int,fixups,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_type_checker(request_rec *r) */ -AP_DECLARE_HOOK(int,type_checker,(request_rec *)) +AP_DECLARE_HOOK(int,type_checker,(request_rec *r)) /** * This routine is called to check for any module-specific restrictions placed @@ -286,7 +286,7 @@ AP_DECLARE_HOOK(int,type_checker,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_access_checker(request_rec *r) */ -AP_DECLARE_HOOK(int,access_checker,(request_rec *)) +AP_DECLARE_HOOK(int,access_checker,(request_rec *r)) /** * This routine is called to check to see if the resource being requested @@ -295,14 +295,14 @@ AP_DECLARE_HOOK(int,access_checker,(request_rec *)) * @return OK, DECLINED, or HTTP_... * @deffunc int ap_run_auth_checker(request_rec *r) */ -AP_DECLARE_HOOK(int,auth_checker,(request_rec *)) +AP_DECLARE_HOOK(int,auth_checker,(request_rec *r)) /** * This hook allows modules to insert filters for the current request * @param r the current request * @deffunc void ap_run_insert_filter(request_rec *r) */ -AP_DECLARE_HOOK(void,insert_filter,(request_rec *)) +AP_DECLARE_HOOK(void,insert_filter,(request_rec *r)) #ifdef __cplusplus } |