X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fintel_rdt.c;h=6f157b8ffc53cc3bfc5d368593fe64c82c536840;hb=cd401b9728839f8b24fd16fac9e9c1753526fd4e;hp=7328836694dee755dbdeaa38c51413286dfa6c52;hpb=f7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91;p=collectd.git diff --git a/src/intel_rdt.c b/src/intel_rdt.c index 73288366..6f157b8f 100644 --- a/src/intel_rdt.c +++ b/src/intel_rdt.c @@ -527,43 +527,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); }