Merge branch 'next' into servicelinking

1 files changed, 3 insertions, 13 deletions

diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index 6dd30bf..2af58c5 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -125,7 +125,6 @@ typedef DWORD32 uint32_t;
 #include "DabMux.h"
 #include "MuxElements.h"
 #include "utils.h"
-#include "ParserCmdline.h"
 #include "ConfigParser.h"
 #include "ManagementServer.h"
 #include "Log.h"
@@ -188,8 +187,8 @@ int main(int argc, char *argv[])
     sa.sa_handler = &signalHandler;
 
     const int sigs[] = {SIGHUP, SIGQUIT, SIGINT, SIGTERM};
-    for (int i = 0; i < 4; i++) {
-        if (sigaction(sigs[i], &sa, NULL) == -1) {
+    for (int sig : sigs) {
+        if (sigaction(sig, &sa, nullptr) == -1) {
             perror("sigaction");
             return EXIT_FAILURE;
         }
@@ -252,18 +251,9 @@ int main(int argc, char *argv[])
                 throw MuxInitException(e.what());
             }
         }
-#if ENABLE_CMDLINE_OPTIONS
-        else {
-            if (!parse_cmdline(argv, argc, outputs, ensemble, &enableTist, &FICL,
-                        &factumAnalyzer, &limit)) {
-                throw MuxInitException();
-            }
-        }
-#else
         else {
             throw MuxInitException("No configuration file specified");
         }
-#endif
 
         int mgmtserverport = pt.get<int>("general.managementport",
                              pt.get<int>("general.statsserverport", 0) );
@@ -399,7 +389,7 @@ int main(int argc, char *argv[])
                     throw MuxInitException();
                 }
 
-                if (output == NULL) {
+                if (output == nullptr) {
                     etiLog.level(error) <<
                         "Unable to init output " <<
                         uri;