Merge branch 'collectd-5.7'

Conflicts:
	src/intel_rdt.c

diff --git a/src/intel_rdt.c b/src/intel_rdt.c
index 2e0fe0f..7966daa 100644 (file)
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@ -544,43 +544,36 @@ rdt_preinit_error1:
 }
 
 static int rdt_config(oconfig_item_t *ci) {
-  int ret = 0;
-
-  ret = rdt_preinit();
-  if (ret != 0) {
+  if (rdt_preinit() != 0) {
     g_state = CONFIGURATION_ERROR;
     /* if we return -1 at this point collectd
       reports a failure in configuration and
       aborts
     */
-    goto exit;
+    return (0);
   }
 
   for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
 
     if (strcasecmp("Cores", child->key) == 0) {
-
-      ret = rdt_config_cgroups(child);
-      if (ret != 0) {
+      if (rdt_config_cgroups(child) != 0) {
         g_state = CONFIGURATION_ERROR;
         /* if we return -1 at this point collectd
            reports a failure in configuration and
            aborts
          */
-        goto exit;
+        return (0);
       }
 
 #if COLLECT_DEBUG
       rdt_dump_cgroups();
 #endif /* COLLECT_DEBUG */
-
     } else {
       ERROR(RDT_PLUGIN ": Unknown configuration parameter \"%s\".", child->key);
     }
   }
 
-exit:
   return 0;
 }