From: Victor Julien <victor@inliniac.net>
Date: Tue, 12 Jul 2016 06:49:48 +0000 (+0200)
Subject: outputs: small code cleanup
X-Git-Tag: suricata-3.1.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7188c2630fc529e6bcd262b620b27b3bebe0e0f1;p=thirdparty%2Fsuricata.git

outputs: small code cleanup
---

diff --git a/src/runmodes.c b/src/runmodes.c
index 2ca3fd03a9..f9bc02938b 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -718,58 +718,61 @@ static void SetupOutput(const char *name, OutputModule *module, OutputCtx *outpu
     }
 }
 
-static void RunModeInitializeEveOutput(ConfNode *conf, OutputCtx *parent_ctx) {
+static void RunModeInitializeEveOutput(ConfNode *conf, OutputCtx *parent_ctx)
+{
     ConfNode *types = ConfNodeLookupChild(conf, "types");
     SCLogDebug("types %p", types);
-    if (types != NULL) {
-        ConfNode *type = NULL;
-        TAILQ_FOREACH(type, &types->head, next) {
-            SCLogConfig("enabling 'eve-log' module '%s'", type->val);
-
-            int sub_count = 0;
-            char subname[256];
-            snprintf(subname, sizeof(subname), "eve-log.%s", type->val);
-
-            /* Now setup all registers logger of this name. */
-            OutputModule *sub_module;
-            TAILQ_FOREACH(sub_module, &output_modules, entries) {
-                if (strcmp(subname, sub_module->conf_name) == 0) {
-                    sub_count++;
-
-                    if (sub_module->parent_name == NULL ||
+    if (types == NULL) {
+        return;
+    }
+
+    ConfNode *type = NULL;
+    TAILQ_FOREACH(type, &types->head, next) {
+        SCLogConfig("enabling 'eve-log' module '%s'", type->val);
+
+        int sub_count = 0;
+        char subname[256];
+        snprintf(subname, sizeof(subname), "eve-log.%s", type->val);
+
+        /* Now setup all registers logger of this name. */
+        OutputModule *sub_module;
+        TAILQ_FOREACH(sub_module, &output_modules, entries) {
+            if (strcmp(subname, sub_module->conf_name) == 0) {
+                sub_count++;
+
+                if (sub_module->parent_name == NULL ||
                         strcmp(sub_module->parent_name, "eve-log") != 0) {
-                        FatalError(SC_ERR_INVALID_ARGUMENT,
+                    FatalError(SC_ERR_INVALID_ARGUMENT,
                             "bad parent for %s", subname);
-                    }
-                    if (sub_module->InitSubFunc == NULL) {
-                        FatalError(SC_ERR_INVALID_ARGUMENT,
+                }
+                if (sub_module->InitSubFunc == NULL) {
+                    FatalError(SC_ERR_INVALID_ARGUMENT,
                             "bad sub-module for %s", subname);
-                    }
-                    ConfNode *sub_output_config =
-                        ConfNodeLookupChild(type, type->val);
-                    // sub_output_config may be NULL if no config
+                }
+                ConfNode *sub_output_config =
+                    ConfNodeLookupChild(type, type->val);
+                // sub_output_config may be NULL if no config
 
-                    /* pass on parent output_ctx */
-                    OutputCtx *sub_output_ctx =
-                        sub_module->InitSubFunc(sub_output_config,
+                /* pass on parent output_ctx */
+                OutputCtx *sub_output_ctx =
+                    sub_module->InitSubFunc(sub_output_config,
                             parent_ctx);
-                    if (sub_output_ctx == NULL) {
-                        continue;
-                    }
+                if (sub_output_ctx == NULL) {
+                    continue;
+                }
 
-                    AddOutputToFreeList(sub_module, sub_output_ctx);
-                    SetupOutput(sub_module->name, sub_module,
+                AddOutputToFreeList(sub_module, sub_output_ctx);
+                SetupOutput(sub_module->name, sub_module,
                         sub_output_ctx);
-                }
             }
+        }
 
-            /* Error is no registered loggers with this name
-             * were found .*/
-            if (!sub_count) {
-                FatalErrorOnInit(SC_ERR_INVALID_ARGUMENT,
+        /* Error is no registered loggers with this name
+         * were found .*/
+        if (!sub_count) {
+            FatalErrorOnInit(SC_ERR_INVALID_ARGUMENT,
                     "No output module named %s", subname);
-                continue;
-            }
+            continue;
         }
     }
 }