From dc2c8be5831ad05d93b2fcf90c4852e4b537763a Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Tue, 14 Dec 2010 23:59:01 +0530 Subject: [PATCH] always read config.h header file first --- src/suricata-common.h | 8 ++++---- src/util-debug.c | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/suricata-common.h b/src/suricata-common.h index a87f8986fb..42af79bac2 100644 --- a/src/suricata-common.h +++ b/src/suricata-common.h @@ -57,6 +57,10 @@ #include +#if HAVE_CONFIG_H +#include +#endif + #ifdef HAVE_SYSLOG_H #include #else @@ -67,10 +71,6 @@ #include "win32-misc.h" #include "win32-service.h" #endif /* OS_WIN32 */ -#if HAVE_CONFIG_H -#include -#endif - #include #if HAVE_POLL_H diff --git a/src/util-debug.c b/src/util-debug.c index faba5d06fd..c82457ad54 100644 --- a/src/util-debug.c +++ b/src/util-debug.c @@ -140,22 +140,31 @@ static inline int SCLogMapLogLevelToSyslogLevel(int log_level) switch (log_level) { case SC_LOG_EMERGENCY: syslog_log_level = LOG_EMERG; + break; case SC_LOG_ALERT: syslog_log_level = LOG_ALERT; + break; case SC_LOG_CRITICAL: syslog_log_level = LOG_CRIT; + break; case SC_LOG_ERROR: syslog_log_level = LOG_ERR; + break; case SC_LOG_WARNING: syslog_log_level = LOG_WARNING; + break; case SC_LOG_NOTICE: syslog_log_level = LOG_NOTICE; + break; case SC_LOG_INFO: syslog_log_level = LOG_INFO; + break; case SC_LOG_DEBUG: syslog_log_level = LOG_DEBUG; + break; default: syslog_log_level = LOG_EMERG; + break; } return syslog_log_level;