Commit 6598b336 authored by Ben Laurie's avatar Ben Laurie
Browse files

More generic -> optional cleanup. 


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

modules/experimental/mod_optional_fn_export.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include "mod_optional_fn_export.h"



/* The alert will note a strange mirror-image style resemblance to

 * mod_generic_hook_import.c. Yes, I _did_ mean import. Think about it.

 * mod_optional_hook_import.c. Yes, I _did_ mean import. Think about it.

 */



static int TestOptionalFn(const char *szStr)

modules/experimental/mod_optional_fn_import.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include "http_protocol.h"



/* The alert will note a strange mirror-image style resemblance to

 * mod_generic_hook_export.c. Yes, I _did_ mean export. Think about it.

 * mod_optional_hook_export.c. Yes, I _did_ mean export. Think about it.

 */



static APR_OPTIONAL_FN_TYPE(TestOptionalFn) *pfn;

modules/experimental/mod_optional_hook_export.c

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ 
#include "mod_optional_hook_export.h"

#include "http_protocol.h"



APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,generic_hook_test,

APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,optional_hook_test,

				    (const char *szStr),

				    (szStr),OK,DECLINED)



static int ExportLogTransaction(request_rec *r)

{

    return ap_run_generic_hook_test(r->the_request);

    return ap_run_optional_hook_test(r->the_request);

}



static void ExportRegisterHooks(apr_pool_t *p)

modules/experimental/mod_optional_hook_export.h

+4 −4
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ 
 * <http://www.apache.org/>.

 */



#ifndef MOD_GENERIC_HOOK_EXPORT_H

#define MOD_GENERIC_HOOK_EXPORT_H

#ifndef MOD_OPTIONAL_HOOK_EXPORT_H

#define MOD_OPTOPNAL_HOOK_EXPORT_H



#include "apr_optional_hooks.h"



APR_DECLARE_EXTERNAL_HOOK(ap,AP_MODULE,int,generic_hook_test,(const char *))

APR_DECLARE_EXTERNAL_HOOK(ap,AP_MODULE,int,optional_hook_test,(const char *))



#endif /* def MOD_GENERIC_HOOK_EXPORT_H */
 
#endif /* def MOD_OPTIONAL_HOOK_EXPORT_H */

modules/experimental/mod_optional_hook_import.c

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ static int ImportGenericHookTestHook(const char *szStr) 


static void ImportRegisterHooks(apr_pool_t *p)

{

    APR_OPTIONAL_HOOK(ap,generic_hook_test,ImportGenericHookTestHook,NULL,NULL,

		      APR_HOOK_MIDDLE);

    APR_OPTIONAL_HOOK(ap,optional_hook_test,ImportGenericHookTestHook,NULL,

		      NULL,APR_HOOK_MIDDLE);

}



module optional_hook_import_module=