From 6644b3438735955231edc9df59be3564538cc9f5 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Wed, 26 Apr 2000 07:14:39 +0000 Subject: add AP_ prefix to *HOOK* macros git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_core.c | 14 +++++++------- modules/http/http_protocol.c | 18 +++++++++--------- modules/http/http_request.c | 26 +++++++++++++------------- modules/http/mod_mime.c | 4 ++-- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'modules/http') diff --git a/modules/http/http_core.c b/modules/http/http_core.c index fb9f343131..7adc2eb1c7 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -2519,15 +2519,15 @@ static unsigned short core_port(const request_rec *r) static void register_hooks(void) { - ap_hook_translate_name(core_translate,NULL,NULL,HOOK_REALLY_LAST); + ap_hook_translate_name(core_translate,NULL,NULL,AP_HOOK_REALLY_LAST); ap_hook_process_connection(ap_process_http_connection,NULL,NULL, - HOOK_REALLY_LAST); - ap_hook_http_method(core_method,NULL,NULL,HOOK_REALLY_LAST); - ap_hook_default_port(core_port,NULL,NULL,HOOK_REALLY_LAST); - ap_hook_open_logs(core_open_logs,NULL,NULL,HOOK_MIDDLE); + AP_HOOK_REALLY_LAST); + ap_hook_http_method(core_method,NULL,NULL,AP_HOOK_REALLY_LAST); + ap_hook_default_port(core_port,NULL,NULL,AP_HOOK_REALLY_LAST); + ap_hook_open_logs(core_open_logs,NULL,NULL,AP_HOOK_MIDDLE); /* FIXME: I suspect we can eliminate the need for these - Ben */ - ap_hook_type_checker(do_nothing,NULL,NULL,HOOK_REALLY_LAST); - ap_hook_access_checker(do_nothing,NULL,NULL,HOOK_REALLY_LAST); + ap_hook_type_checker(do_nothing,NULL,NULL,AP_HOOK_REALLY_LAST); + ap_hook_access_checker(do_nothing,NULL,NULL,AP_HOOK_REALLY_LAST); } API_VAR_EXPORT module core_module = { diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 77aecaf2c0..aaca570fbb 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -78,11 +78,11 @@ #include "mpm_status.h" #include -HOOK_STRUCT( - HOOK_LINK(post_read_request) - HOOK_LINK(log_transaction) - HOOK_LINK(http_method) - HOOK_LINK(default_port) +AP_HOOK_STRUCT( + AP_HOOK_LINK(post_read_request) + AP_HOOK_LINK(log_transaction) + AP_HOOK_LINK(http_method) + AP_HOOK_LINK(default_port) ) #define SET_BYTES_SENT(r) \ @@ -2833,9 +2833,9 @@ API_EXPORT(void) ap_send_error_response(request_rec *r, int recursive_error) ap_rflush(r); } -IMPLEMENT_HOOK_RUN_ALL(int,post_read_request,(request_rec *r),(r),OK,DECLINED) -IMPLEMENT_HOOK_RUN_ALL(int,log_transaction,(request_rec *r),(r),OK,DECLINED) -IMPLEMENT_HOOK_RUN_FIRST(const char *,http_method,(const request_rec *r),(r), +AP_IMPLEMENT_HOOK_RUN_ALL(int,post_read_request,(request_rec *r),(r),OK,DECLINED) +AP_IMPLEMENT_HOOK_RUN_ALL(int,log_transaction,(request_rec *r),(r),OK,DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(const char *,http_method,(const request_rec *r),(r), NULL) -IMPLEMENT_HOOK_RUN_FIRST(unsigned short,default_port,(const request_rec *r), +AP_IMPLEMENT_HOOK_RUN_FIRST(unsigned short,default_port,(const request_rec *r), (r),0) diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 8e52484af8..e1dda872de 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -77,21 +77,21 @@ #include "http_main.h" #include "apr_fnmatch.h" -HOOK_STRUCT( - HOOK_LINK(translate_name) - HOOK_LINK(check_user_id) - HOOK_LINK(fixups) - HOOK_LINK(type_checker) - HOOK_LINK(access_checker) - HOOK_LINK(auth_checker) +AP_HOOK_STRUCT( + AP_HOOK_LINK(translate_name) + AP_HOOK_LINK(check_user_id) + AP_HOOK_LINK(fixups) + AP_HOOK_LINK(type_checker) + AP_HOOK_LINK(access_checker) + AP_HOOK_LINK(auth_checker) ) -IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,(request_rec *r),(r),DECLINED) -IMPLEMENT_HOOK_RUN_FIRST(int,check_user_id,(request_rec *r),(r),DECLINED) -IMPLEMENT_HOOK_RUN_ALL(int,fixups,(request_rec *r),(r),OK,DECLINED) -IMPLEMENT_HOOK_RUN_FIRST(int,type_checker,(request_rec *r),(r),DECLINED) -IMPLEMENT_HOOK_RUN_ALL(int,access_checker,(request_rec *r),(r),OK,DECLINED) -IMPLEMENT_HOOK_RUN_FIRST(int,auth_checker,(request_rec *r),(r),DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,(request_rec *r),(r),DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(int,check_user_id,(request_rec *r),(r),DECLINED) +AP_IMPLEMENT_HOOK_RUN_ALL(int,fixups,(request_rec *r),(r),OK,DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(int,type_checker,(request_rec *r),(r),DECLINED) +AP_IMPLEMENT_HOOK_RUN_ALL(int,access_checker,(request_rec *r),(r),OK,DECLINED) +AP_IMPLEMENT_HOOK_RUN_FIRST(int,auth_checker,(request_rec *r),(r),DECLINED) /***************************************************************** * diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index 97102a69e5..795de4dff0 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -737,8 +737,8 @@ static int find_ct(request_rec *r) static void register_hooks(void) { - ap_hook_type_checker(find_ct,NULL,NULL,HOOK_MIDDLE); - ap_hook_post_config(mime_post_config,NULL,NULL,HOOK_MIDDLE); + ap_hook_type_checker(find_ct,NULL,NULL,AP_HOOK_MIDDLE); + ap_hook_post_config(mime_post_config,NULL,NULL,AP_HOOK_MIDDLE); } module MODULE_VAR_EXPORT mime_module = { -- cgit v1.2.3