Commit 2183ceb9 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  We seem to use fn_t *fn throughout the rest of apache, so normalize this
  syntax for mod_include's include_handler(_t)


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

modules/filters/mod_include.c

+1 −1
Original line number Diff line number Diff line
@@ -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 *func)

{

    apr_hash_set(include_hash, tag, strlen(tag) + 1, (const void *)func);

}

modules/filters/mod_include.h

+2 −2
Original line number Diff line number Diff line
@@ -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)(include_ctx_t *ctx, apr_bucket_brigade **bb, 

                       request_rec *r, ap_filter_t *f, apr_bucket *head_ptr, 

                       apr_bucket **inserted_head);
@@ -209,6 +209,6 @@ APR_DECLARE_OPTIONAL_FN(void, ap_ssi_parse_string, (request_rec *r, 
                                                    size_t length,

                                                    int leave_name));

APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, (char *tag,

                                                         include_handler func));

                                                         include_handler *func));



#endif /* MOD_INCLUDE */