projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
protocols.c
diff --git
a/src/protocols.c
b/src/protocols.c
index
75e9a1c
..
0dfba21
100644
(file)
--- a/
src/protocols.c
+++ b/
src/protocols.c
@@
-1,6
+1,6
@@
/**
* collectd - src/protocols.c
/**
* collectd - src/protocols.c
- * Copyright (C) 2009 Florian octo Forster
+ * Copyright (C) 2009
,2010
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-51,14
+51,10
@@
static void submit (const char *protocol_name,
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
+ int status;
- char *tmp_ptr;
-
- errno = 0;
- tmp_ptr = NULL;
- values[0].counter = (counter_t) strtoll (str_value, &tmp_ptr,
- /* base = */ 0);
- if ((errno != 0) || (tmp_ptr == str_value))
+ status = parse_value (str_value, values, DS_TYPE_DERIVE);
+ if (status != 0)
{
ERROR ("protocols plugin: Parsing string as integer failed: %s",
str_value);
{
ERROR ("protocols plugin: Parsing string as integer failed: %s",
str_value);
@@
-166,7
+162,7
@@
static int read_file (const char *path)
if (key_fields_num != value_fields_num)
{
ERROR ("protocols plugin: Number of fields in keys and values lines "
if (key_fields_num != value_fields_num)
{
ERROR ("protocols plugin: Number of fields in keys and values lines "
- "dont match: %i vs %i.",
+ "don
'
t match: %i vs %i.",
key_fields_num, value_fields_num);
break;
}
key_fields_num, value_fields_num);
break;
}
@@
-224,9
+220,7
@@
static int protocols_config (const char *key, const char *value)
else if (strcasecmp (key, "IgnoreSelected") == 0)
{
int invert = 1;
else if (strcasecmp (key, "IgnoreSelected") == 0)
{
int invert = 1;
- if ((strcasecmp (value, "True") == 0)
- || (strcasecmp (value, "Yes") == 0)
- || (strcasecmp (value, "On") == 0))
+ if (IS_TRUE (value))
invert = 0;
ignorelist_set_invert (values_list, invert);
}
invert = 0;
ignorelist_set_invert (values_list, invert);
}