github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert msr_log as macro (still work-in-progress)

Browse Source
This commit is contained in:
brectanus 2007-06-14 16:13:53 +00:00
parent 81d0f84ad3
commit d55e023bf7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache2/apache2.h
View File

@ -63,14 +63,7 @@ char DSOLOCAL *get_env_var(request_rec *r, char *name);
void DSOLOCAL internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
int level, const char *text, va_list ap);
/* msr_log is now a macro to avoid function call overhead. Nothing
* is done to avoid expansion of arguments, so do not call with
* arguments that cannot be duplicated (ie no level++, etc.)
*/
void DSOLOCAL _msr_log(modsec_rec *msr, int level, const char *text, ...);
#define msr_log(msr, lvl, ...) \
do { if ((msr->txcfg != NULL) && (lvl <= msr->txcfg->debuglog_level)) _msr_log(msr, lvl, __VA_ARGS__); } while(0)
void DSOLOCAL msr_log(modsec_rec *msr, int level, const char *text, ...);
char DSOLOCAL *format_error_log_message(apr_pool_t *mp, error_message *em);

2
apache2/apache2_util.c
View File

@ -245,7 +245,7 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
* Logs one message at the given level to the debug log (and to the
* Apache error log if the message is important enough.
*/
void _msr_log(modsec_rec *msr, int level, const char *text, ...) {
void msr_log(modsec_rec *msr, int level, const char *text, ...) {
va_list ap;
va_start(ap, text);