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

apache2/apache2.h

@@ -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);
 
-
+void DSOLOCAL msr_log(modsec_rec *msr, int level, const char *text, ...);
-/* 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)
 
 char DSOLOCAL *format_error_log_message(apr_pool_t *mp, error_message *em);
 

apache2/apache2_util.c

@@ -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);