projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add snprintf wrapper for GCC 8.2/3
[collectd.git]
/
src
/
protocols.c
diff --git
a/src/protocols.c
b/src/protocols.c
index
64735e6
..
86fa795
100644
(file)
--- a/
src/protocols.c
+++ b/
src/protocols.c
@@
-26,9
+26,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.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."
#if !KERNEL_LINUX
#error "No applicable input method."
@@
-45,7
+45,7
@@
static const char *config_keys[] = {
};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
-static ignorelist_t *values_list
= NULL
;
+static ignorelist_t *values_list;
/*
* Functions
/*
* Functions
@@
-58,7
+58,6
@@
static void submit(const char *protocol_name, const char *str_key,
status = parse_value(str_value, &value, DS_TYPE_DERIVE);
if (status != 0) {
status = parse_value(str_value, &value, DS_TYPE_DERIVE);
if (status != 0) {
- ERROR("protocols plugin: Parsing string as integer failed: %s", str_value);
return;
}
return;
}
@@
-87,9
+86,8
@@
static int read_file(const char *path) {
fh = fopen(path, "r");
if (fh == NULL) {
fh = fopen(path, "r");
if (fh == NULL) {
- ERROR("protocols plugin: fopen (%s) failed: %s.", path,
- sstrerror(errno, key_buffer, sizeof(key_buffer)));
- return (-1);
+ ERROR("protocols plugin: fopen (%s) failed: %s.", path, STRERRNO);
+ return -1;
}
status = -1;
}
status = -1;
@@
-157,7
+155,7
@@
static int read_file(const char *path) {
char match_name[2 * DATA_MAX_NAME_LEN];
ssnprintf(match_name, sizeof(match_name), "%s:%s", key_buffer,
char match_name[2 * DATA_MAX_NAME_LEN];
ssnprintf(match_name, sizeof(match_name), "%s:%s", key_buffer,
-
key_fields[i]);
+ key_fields[i]);
if (ignorelist_match(values_list, match_name))
continue;
if (ignorelist_match(values_list, match_name))
continue;
@@
-169,7
+167,7
@@
static int read_file(const char *path) {
fclose(fh);
fclose(fh);
- return
(status)
;
+ return
status
;
} /* int read_file */
static int protocols_read(void) {
} /* int read_file */
static int protocols_read(void) {
@@
-185,9
+183,9
@@
static int protocols_read(void) {
success++;
if (success == 0)
success++;
if (success == 0)
- return
(-1)
;
+ return
-1
;
- return
(0)
;
+ return
0
;
} /* int protocols_read */
static int protocols_config(const char *key, const char *value) {
} /* int protocols_read */
static int protocols_config(const char *key, const char *value) {
@@
-202,10
+200,10
@@
static int protocols_config(const char *key, const char *value) {
invert = 0;
ignorelist_set_invert(values_list, invert);
} else {
invert = 0;
ignorelist_set_invert(values_list, invert);
} else {
- return
(-1)
;
+ return
-1
;
}
}
- return
(0)
;
+ return
0
;
} /* int protocols_config */
void module_register(void) {
} /* int protocols_config */
void module_register(void) {
@@
-213,5
+211,3
@@
void module_register(void) {
config_keys_num);
plugin_register_read("protocols", protocols_read);
} /* void module_register */
config_keys_num);
plugin_register_read("protocols", protocols_read);
} /* void module_register */
-
-/* vim: set sw=2 sts=2 et : */