--- parser3/src/targets/apache/mod_parser3.c 2010/11/22 23:42:09 1.7 +++ parser3/src/targets/apache/mod_parser3.c 2010/11/23 00:07:33 1.9 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/22 23:42:09 $"; +static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/23 00:07:33 $"; #ifdef WIN32 #include @@ -65,7 +65,7 @@ static Parser_module_config *our_dconfig return (Parser_module_config *) ap_get_module_config(r->per_dir_config, &parser3_module); } -static const char* cmd_parser_config(cmd_parms *cmd, void *mconfig, char *file_spec) { +static const char* cmd_parser_config(cmd_parms *cmd, void *mconfig, const char *file_spec) { Parser_module_config *cfg = (Parser_module_config *) mconfig; cfg->parser_config_filespec=file_spec; return NULL; @@ -146,15 +146,8 @@ static void *parser_create_server_config */ static const command_rec parser_cmds[] = { - { - "ParserConfig", /* directive name */ - (const char* (*)(void))((void *)cmd_parser_config), // config action routine - (void*)0, /* argument to include in call */ - (int)(OR_OPTIONS), /* where available */ - TAKE1, /* arguments */ - "Parser config filespec" // directive description - }, - {NULL} + { "ParserConfig", (cmd_func)cmd_parser_config, 0, OR_OPTIONS, TAKE1, "Parser config filespec" }, + { NULL } }; /*--------------------------------------------------------------------------*/ @@ -229,21 +222,6 @@ module MODULE_VAR_EXPORT parser3_module // interface to C++ -#define PA_APLOG_EMERG 0 /* system is unusable */ -#define PA_APLOG_ALERT 1 /* action must be taken immediately */ -#define PA_APLOG_CRIT 2 /* critical conditions */ -#define PA_APLOG_ERR 3 /* error conditions */ -#define PA_APLOG_WARNING 4 /* warning conditions */ -#define PA_APLOG_NOTICE 5 /* normal but significant condition */ -#define PA_APLOG_INFO 6 /* informational */ -#define PA_APLOG_DEBUG 7 /* debug-level messages */ - -#define PA_APLOG_LEVELMASK 7 /* mask off the level value */ - -#define PA_APLOG_NOERRNO (PA_APLOG_LEVELMASK + 1) - -#define PA_APLOG_MARK __FILE__,__LINE__ - void pa_ap_log_rerror(const char *file, int line, int level, const pa_request_rec *s, const char *fmt, ...) { const char* str; va_list l;