X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fprotocols.c;h=7bfa663c2a37b618c64292dcc35751da6d577328;hp=a50539ef5a618e532ab821110fcc7d2b9444fb79;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=8e5e2e927f9cf051ef210473b1b48ff62d81f585 diff --git a/src/protocols.c b/src/protocols.c index a50539ef..7bfa663c 100644 --- a/src/protocols.c +++ b/src/protocols.c @@ -26,9 +26,9 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_ignorelist.h" +#include "utils/common/common.h" +#include "utils/ignorelist/ignorelist.h" #if !KERNEL_LINUX #error "No applicable input method." @@ -41,11 +41,12 @@ * Global variables */ static const char *config_keys[] = { - "Value", "IgnoreSelected", + "Value", + "IgnoreSelected", }; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static ignorelist_t *values_list = NULL; +static ignorelist_t *values_list; /* * Functions @@ -58,7 +59,6 @@ static void submit(const char *protocol_name, const char *str_key, status = parse_value(str_value, &value, DS_TYPE_DERIVE); if (status != 0) { - ERROR("protocols plugin: Parsing string as integer failed: %s", str_value); return; } @@ -155,8 +155,8 @@ static int read_file(const char *path) { if (values_list != NULL) { char match_name[2 * DATA_MAX_NAME_LEN]; - snprintf(match_name, sizeof(match_name), "%s:%s", key_buffer, - key_fields[i]); + ssnprintf(match_name, sizeof(match_name), "%s:%s", key_buffer, + key_fields[i]); if (ignorelist_match(values_list, match_name)) continue;