From: Xavier Lange <xrlange@gmail.com>
Date: Tue, 20 Mar 2012 21:02:49 +0000 (-0700)
Subject: Make conf_test local. Simplify if/else to if.
X-Git-Tag: suricata-1.3beta1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d774dae61603a49486292d2999e52c48ceb29c3;p=thirdparty%2Fsuricata.git

Make conf_test local. Simplify if/else to if.
---

diff --git a/src/suricata.c b/src/suricata.c
index 388a4b62ee..fcbcf6bd1e 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -220,9 +220,6 @@ intmax_t max_pending_packets;
 /** set caps or not */
 int sc_set_caps;
 
-/** test configuration and exit */
-int conf_test = 0;
-
 int RunmodeIsUnittests(void) {
     if (run_mode == RUNMODE_UNITTEST)
         return 1;
@@ -629,6 +626,7 @@ int main(int argc, char **argv)
     char pcap_dev[128];
     char *sig_file = NULL;
     int sig_file_exclusive = FALSE;
+    int conf_test = 0;
     char *conf_filename = NULL;
     char *pid_filename = NULL;
 #ifdef UNITTESTS
@@ -1713,10 +1711,10 @@ int main(int argc, char **argv)
     if(conf_test == 1){
         SCLogInfo("Configuration provided was successfully loaded. Exiting.");
         exit(EXIT_SUCCESS);
-    } else {
-        RunModeDispatch(run_mode, runmode_custom_mode, de_ctx);
     }
 
+    RunModeDispatch(run_mode, runmode_custom_mode, de_ctx);
+
 #ifdef __SC_CUDA_SUPPORT__
     if (PatternMatchDefaultMatcher() == MPM_B2G_CUDA) {
         /* start the dispatcher thread for this module */