Commit 8dc95bf7 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

add AP_ prefix to *HOOK* macros 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68
parent 4a4bd8c0

include/http_config.h

+4 −4
Original line number Diff line number Diff line
@@ -413,12 +413,12 @@ CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, cons 
#endif



  /* Hooks */

DECLARE_HOOK(int,header_parser,(request_rec *))

DECLARE_HOOK(void,post_config,

AP_DECLARE_HOOK(int,header_parser,(request_rec *))

AP_DECLARE_HOOK(void,post_config,

	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))

DECLARE_HOOK(void,open_logs,

AP_DECLARE_HOOK(void,open_logs,

	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))

DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))

AP_DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))



#ifdef __cplusplus

}

include/http_connection.h

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ int ap_process_http_connection(conn_rec *); 
#endif



  /* Hooks */

DECLARE_HOOK(void,pre_connection,(conn_rec *))

DECLARE_HOOK(int,process_connection,(conn_rec *))

AP_DECLARE_HOOK(void,pre_connection,(conn_rec *))

AP_DECLARE_HOOK(int,process_connection,(conn_rec *))



#ifdef __cplusplus

}

include/http_protocol.h

+4 −4
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ API_EXPORT(int) ap_method_number_of(const char *method); 
   * post_read_request --- run right after read_request or internal_redirect,

   *                  and not run during any subrequests.

   */

DECLARE_HOOK(int,post_read_request,(request_rec *))

DECLARE_HOOK(int,log_transaction,(request_rec *))

DECLARE_HOOK(const char *,http_method,(const request_rec *))

DECLARE_HOOK(unsigned short,default_port,(const request_rec *))

AP_DECLARE_HOOK(int,post_read_request,(request_rec *))

AP_DECLARE_HOOK(int,log_transaction,(request_rec *))

AP_DECLARE_HOOK(const char *,http_method,(const request_rec *))

AP_DECLARE_HOOK(unsigned short,default_port,(const request_rec *))



#ifdef __cplusplus

}

include/http_request.h

+6 −6
Original line number Diff line number Diff line
@@ -114,12 +114,12 @@ API_EXPORT(void) ap_die(int type, request_rec *r); 
#endif



  /* Hooks */

DECLARE_HOOK(int,translate_name,(request_rec *))

DECLARE_HOOK(int,check_user_id,(request_rec *))

DECLARE_HOOK(int,fixups,(request_rec *))

DECLARE_HOOK(int,type_checker,(request_rec *))

DECLARE_HOOK(int,access_checker,(request_rec *))

DECLARE_HOOK(int,auth_checker,(request_rec *))

AP_DECLARE_HOOK(int,translate_name,(request_rec *))

AP_DECLARE_HOOK(int,check_user_id,(request_rec *))

AP_DECLARE_HOOK(int,fixups,(request_rec *))

AP_DECLARE_HOOK(int,type_checker,(request_rec *))

AP_DECLARE_HOOK(int,access_checker,(request_rec *))

AP_DECLARE_HOOK(int,auth_checker,(request_rec *))



#ifdef __cplusplus

}

modules/aaa/mod_access.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int check_dir_access(request_rec *r) 


static void register_hooks(void)

{

    ap_hook_access_checker(check_dir_access,NULL,NULL,HOOK_MIDDLE);

    ap_hook_access_checker(check_dir_access,NULL,NULL,AP_HOOK_MIDDLE);

}



module MODULE_VAR_EXPORT access_module =