From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 21:49:05 +0000 (+0100)
Subject: src/filter_chain.c: Refactor fc_process_chain() a wee bit.
X-Git-Tag: collectd-5.5.1~24^2~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=dd13cefb6c5b9d19bf7191d64389e704612367d4;p=collectd.git

src/filter_chain.c: Refactor fc_process_chain() a wee bit.
---

diff --git a/src/filter_chain.c b/src/filter_chain.c
index e25e7a03..903f66f9 100644
--- a/src/filter_chain.c
+++ b/src/filter_chain.c
@@ -882,17 +882,17 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
 {
   fc_rule_t *rule;
   fc_target_t *target;
-  int status;
+  int status = FC_TARGET_CONTINUE;
 
   if (chain == NULL)
     return (-1);
 
   DEBUG ("fc_process_chain (chain = %s);", chain->name);
 
-  status = FC_TARGET_CONTINUE;
   for (rule = chain->rules; rule != NULL; rule = rule->next)
   {
     fc_match_t *match;
+    status = FC_TARGET_CONTINUE;
 
     if (rule->name[0] != 0)
     {
@@ -954,8 +954,7 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
       }
     }
 
-    if ((status == FC_TARGET_STOP)
-        || (status == FC_TARGET_RETURN))
+    if ((status == FC_TARGET_STOP) || (status == FC_TARGET_RETURN))
     {
       if (rule->name[0] != 0)
       {
@@ -966,16 +965,10 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
       }
       break;
     }
-    else
-    {
-      status = FC_TARGET_CONTINUE;
-    }
   } /* for (rule) */
 
-  if (status == FC_TARGET_STOP)
-    return (FC_TARGET_STOP);
-  else if (status == FC_TARGET_RETURN)
-    return (FC_TARGET_CONTINUE);
+  if ((status == FC_TARGET_STOP) || (status == FC_TARGET_RETURN))
+    return (status);
 
   DEBUG ("fc_process_chain (%s): Executing the default targets.",
       chain->name);