More generic -> optional cleanup.

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

diff --git a/modules/experimental/mod_optional_fn_export.c b/modules/experimental/mod_optional_fn_export.c
index b214a36621b2e8e28efc10ccc5fed2229a725a14..aea030e3fcdec8e36cf0612f3c3b12c55390d8be 100644 (file)
--- a/modules/experimental/mod_optional_fn_export.c
+++ b/modules/experimental/mod_optional_fn_export.c
@@ -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)

diff --git a/modules/experimental/mod_optional_fn_import.c b/modules/experimental/mod_optional_fn_import.c
index 3be3b6be6d88699174a9a1a91e5ee2e1fd21ac80..72222105cbbeafecd9240466112979d3b64ac083 100644 (file)
--- a/modules/experimental/mod_optional_fn_import.c
+++ b/modules/experimental/mod_optional_fn_import.c
@@ -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;

diff --git a/modules/experimental/mod_optional_hook_export.c b/modules/experimental/mod_optional_hook_export.c
index 34ef97b543aee095ee24c578e83463d2445f5359..e17660572dc376d37c003e511de06e25600bc9b3 100644 (file)
--- a/modules/experimental/mod_optional_hook_export.c
+++ b/modules/experimental/mod_optional_hook_export.c
@@ -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)

diff --git a/modules/experimental/mod_optional_hook_export.h b/modules/experimental/mod_optional_hook_export.h
index 7494078cdd244bfd9abcb0266e952a6a2fcd1ec2..0510ba0d77cdf524965bc9de6b916088ba3585aa 100644 (file)
--- a/modules/experimental/mod_optional_hook_export.h
+++ b/modules/experimental/mod_optional_hook_export.h
@@ -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 */

diff --git a/modules/experimental/mod_optional_hook_import.c b/modules/experimental/mod_optional_hook_import.c
index ebf01586108c4dba4f00c484052d31d6f3df26e3..16e64ca77d351e5ca81a790c61e8e2eb726e5d2b 100644 (file)
--- a/modules/experimental/mod_optional_hook_import.c
+++ b/modules/experimental/mod_optional_hook_import.c
@@ -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=

diff --git a/modules/test/mod_optional_fn_export.c b/modules/test/mod_optional_fn_export.c
index b214a36621b2e8e28efc10ccc5fed2229a725a14..aea030e3fcdec8e36cf0612f3c3b12c55390d8be 100644 (file)
--- a/modules/test/mod_optional_fn_export.c
+++ b/modules/test/mod_optional_fn_export.c
@@ -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)

diff --git a/modules/test/mod_optional_fn_import.c b/modules/test/mod_optional_fn_import.c
index 3be3b6be6d88699174a9a1a91e5ee2e1fd21ac80..72222105cbbeafecd9240466112979d3b64ac083 100644 (file)
--- a/modules/test/mod_optional_fn_import.c
+++ b/modules/test/mod_optional_fn_import.c
@@ -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;

diff --git a/modules/test/mod_optional_hook_export.c b/modules/test/mod_optional_hook_export.c
index 34ef97b543aee095ee24c578e83463d2445f5359..e17660572dc376d37c003e511de06e25600bc9b3 100644 (file)
--- a/modules/test/mod_optional_hook_export.c
+++ b/modules/test/mod_optional_hook_export.c
@@ -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)

diff --git a/modules/test/mod_optional_hook_export.h b/modules/test/mod_optional_hook_export.h
index 7494078cdd244bfd9abcb0266e952a6a2fcd1ec2..0510ba0d77cdf524965bc9de6b916088ba3585aa 100644 (file)
--- a/modules/test/mod_optional_hook_export.h
+++ b/modules/test/mod_optional_hook_export.h
@@ -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 */

diff --git a/modules/test/mod_optional_hook_import.c b/modules/test/mod_optional_hook_import.c
index ebf01586108c4dba4f00c484052d31d6f3df26e3..16e64ca77d351e5ca81a790c61e8e2eb726e5d2b 100644 (file)
--- a/modules/test/mod_optional_hook_import.c
+++ b/modules/test/mod_optional_hook_import.c
@@ -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=