From 54b290a142c99a765b72e74b2e9772be8be0cbe4 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 1 Nov 2005 18:34:21 +0000 Subject: [PATCH] making the module name match apache2s requirements git-svn-id: svn://svn.open-ils.org/ILS/trunk@1935 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/apachemods/mod_xmltools.c | 12 ++++++------ Open-ILS/src/apachemods/mod_xmltools.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/apachemods/mod_xmltools.c b/Open-ILS/src/apachemods/mod_xmltools.c index 0eaa324a7c..240bc06556 100644 --- a/Open-ILS/src/apachemods/mod_xmltools.c +++ b/Open-ILS/src/apachemods/mod_xmltools.c @@ -3,19 +3,19 @@ /* Configuration handlers -------------------------------------------------------- */ static const char* mod_xmltools_set_locale_dir(cmd_parms *parms, void *config, const char *arg) { - mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools); + mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools_module); cfg->locale_dir = (char*) arg; return NULL; } static const char* mod_xmltools_set_default_locale(cmd_parms *parms, void *config, const char *arg) { - mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools); + mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools_module); cfg->default_locale = (char*) arg; return NULL; } static const char* mod_xmltools_set_pre_xsl(cmd_parms *parms, void *config, const char *arg) { - mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools); + mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools_module); cfg->pre_xsl = xsltParseStylesheetFile( (xmlChar*) arg ); if(cfg->pre_xsl == NULL) { fprintf(stderr, "Unable to parse PreXSL stylesheet %s\n", (char*) arg ); @@ -25,7 +25,7 @@ static const char* mod_xmltools_set_pre_xsl(cmd_parms *parms, void *config, cons } static const char* mod_xmltools_set_post_xsl(cmd_parms *parms, void *config, const char *arg) { - mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools); + mod_xmltools_config *cfg = ap_get_module_config(parms->server->module_config, &mod_xmltools_module); cfg->post_xsl = xsltParseStylesheetFile( (xmlChar*) arg ); if(cfg->post_xsl == NULL) { fprintf(stderr, "Unable to parse PostXSL stylesheet %s\n", (char*) arg ); @@ -67,7 +67,7 @@ static int mod_xmltools_handler (request_rec* r) { if (strcmp(r->handler, MODULE_NAME )) return DECLINED; - mod_xmltools_config *cfg = ap_get_module_config(r->server->module_config, &mod_xmltools); + mod_xmltools_config *cfg = ap_get_module_config(r->server->module_config, &mod_xmltools_module); char* locale_dir = cfg->locale_dir; char* default_locale = cfg->default_locale; xsltStylesheetPtr pre_xsl = cfg->pre_xsl; @@ -167,7 +167,7 @@ static void mod_xmltools_register_hooks (apr_pool_t *p) { /* finally, flesh the module */ -module AP_MODULE_DECLARE_DATA mod_xmltools = { +module AP_MODULE_DECLARE_DATA mod_xmltools_module = { STANDARD20_MODULE_STUFF, NULL, NULL, diff --git a/Open-ILS/src/apachemods/mod_xmltools.h b/Open-ILS/src/apachemods/mod_xmltools.h index 8dd7e63994..18300009b8 100644 --- a/Open-ILS/src/apachemods/mod_xmltools.h +++ b/Open-ILS/src/apachemods/mod_xmltools.h @@ -4,7 +4,7 @@ #include #include -#define MODULE_NAME "mod_xmltools" /* our module name */ +#define MODULE_NAME "mod_xmltools_module" /* our module name */ #define PARAM_LOCALE "locale" /* the URL param for the local directory */ #define LANG_DTD "lang.dtd" /* the DTD for the test entities */ @@ -26,7 +26,7 @@ /* This module */ -module AP_MODULE_DECLARE_DATA mod_xmltools; +module AP_MODULE_DECLARE_DATA mod_xmltools_module; /* our config structure */ -- 2.43.2