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.5'
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
9b236cb
..
3265561
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-819,6
+819,8
@@
static int rrd_config (const char *key, const char *value)
{
fprintf (stderr, "rrdtool: `CacheTimeout' must "
"be greater than 0.\n");
{
fprintf (stderr, "rrdtool: `CacheTimeout' must "
"be greater than 0.\n");
+ ERROR ("rrdtool: `CacheTimeout' must "
+ "be greater than 0.\n");
return (1);
}
cache_timeout = tmp;
return (1);
}
cache_timeout = tmp;
@@
-830,6
+832,8
@@
static int rrd_config (const char *key, const char *value)
{
fprintf (stderr, "rrdtool: `CacheFlush' must "
"be greater than 0.\n");
{
fprintf (stderr, "rrdtool: `CacheFlush' must "
"be greater than 0.\n");
+ ERROR ("rrdtool: `CacheFlush' must "
+ "be greater than 0.\n");
return (1);
}
cache_flush_timeout = tmp;
return (1);
}
cache_flush_timeout = tmp;
@@
-873,6
+877,8
@@
static int rrd_config (const char *key, const char *value)
{
fprintf (stderr, "rrdtool: `RRARows' must "
"be greater than 0.\n");
{
fprintf (stderr, "rrdtool: `RRARows' must "
"be greater than 0.\n");
+ ERROR ("rrdtool: `RRARows' must "
+ "be greater than 0.\n");
return (1);
}
rrdcreate_config.rrarows = tmp;
return (1);
}
rrdcreate_config.rrarows = tmp;
@@
-899,6
+905,7
@@
static int rrd_config (const char *key, const char *value)
if (tmp_alloc == NULL)
{
fprintf (stderr, "rrdtool: realloc failed.\n");
if (tmp_alloc == NULL)
{
fprintf (stderr, "rrdtool: realloc failed.\n");
+ ERROR ("rrdtool: realloc failed.\n");
free (value_copy);
return (1);
}
free (value_copy);
return (1);
}
@@
-922,6
+929,8
@@
static int rrd_config (const char *key, const char *value)
{
fprintf (stderr, "rrdtool: `XFF' must "
"be in the range 0 to 1 (exclusive).");
{
fprintf (stderr, "rrdtool: `XFF' must "
"be in the range 0 to 1 (exclusive).");
+ ERROR ("rrdtool: `XFF' must "
+ "be in the range 0 to 1 (exclusive).");
return (1);
}
rrdcreate_config.xff = tmp;
return (1);
}
rrdcreate_config.xff = tmp;