change include_handler to include_handler_fn_t, and clean up a nasty

  explicit cast that could float from the include_handler_fn_t declaration.

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 7e2e182d62c3679ddb027e22eed252578f3d5b7d..bb7e035aeff048af74439b4e57b82287ad54925c 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2515,9 +2515,9 @@ static void send_parsed_content(apr_bucket_brigade **bb, request_rec *r,
             ctx->curr_tag_pos = &ctx->combined_tag[ctx->directive_length+1];
 
             handle_func = 
-                (int (*)(include_ctx_t *, apr_bucket_brigade **, request_rec *,
-                    ap_filter_t *, apr_bucket *, apr_bucket **))
-                apr_hash_get(include_hash, ctx->combined_tag, ctx->directive_length+1);
+                (include_handler_fn_t *)apr_hash_get(include_hash, 
+                                                     ctx->combined_tag, 
+                                                     ctx->directive_length+1);
             if (handle_func != NULL) {
                 ret = (*handle_func)(ctx, bb, r, f, dptr, &content_head);
             }
@@ -2790,7 +2790,7 @@ static int includes_filter(ap_filter_t *f, apr_bucket_brigade *b)
     return OK;
 }
 
-static void ap_register_include_handler(char *tag, include_handler *func)
+static void ap_register_include_handler(char *tag, include_handler_fn_t *func)
 {
     apr_hash_set(include_hash, tag, strlen(tag) + 1, (const void *)func);
 }

diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h
index 8a4e4b62cc55fe0bd60ac05c1bda0c7707c3318c..0cb0427c8c5afc9753655c0c451a18c3f28ea1c0 100644 (file)
--- a/modules/filters/mod_include.h
+++ b/modules/filters/mod_include.h
@@ -195,7 +195,7 @@ if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) &&                \
 }
 
 
-typedef int (include_handler)(include_ctx_t *ctx, apr_bucket_brigade **bb, 
+typedef int (include_handler_fn_t)(include_ctx_t *ctx, apr_bucket_brigade **bb,
                        request_rec *r, ap_filter_t *f, apr_bucket *head_ptr, 
                        apr_bucket **inserted_head);
 
@@ -208,7 +208,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_ssi_parse_string, (request_rec *r,
                                                     char *out,
                                                     size_t length,
                                                     int leave_name));
-APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, (char *tag,
-                                                         include_handler *func));
+APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, 
+                        (char *tag, include_handler_fn_t *func));
 
 #endif /* MOD_INCLUDE */