projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pri
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
65725f8
..
e3ad07e
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-186,8
+186,8
@@
static int value_list_to_string_multiple(char *buffer, int buffer_len,
return -1;
if (ds->ds[i].type == DS_TYPE_COUNTER)
return -1;
if (ds->ds[i].type == DS_TYPE_COUNTER)
- status = snprintf(buffer + offset, buffer_len - offset, ":%
llu"
,
- vl->values[i].counter);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%
" PRIu64
,
+
(uint64_t)
vl->values[i].counter);
else if (ds->ds[i].type == DS_TYPE_GAUGE)
status = snprintf(buffer + offset, buffer_len - offset, ":" GAUGE_FORMAT,
vl->values[i].gauge);
else if (ds->ds[i].type == DS_TYPE_GAUGE)
status = snprintf(buffer + offset, buffer_len - offset, ":" GAUGE_FORMAT,
vl->values[i].gauge);
@@
-226,8
+226,8
@@
static int value_list_to_string(char *buffer, int buffer_len,
vl->values[0].gauge);
break;
case DS_TYPE_COUNTER:
vl->values[0].gauge);
break;
case DS_TYPE_COUNTER:
- status = snprintf(buffer, buffer_len, "%u:%
llu"
, (unsigned)tt,
- vl->values[0].counter);
+ status = snprintf(buffer, buffer_len, "%u:%
" PRIu64
, (unsigned)tt,
+
(uint64_t)
vl->values[0].counter);
break;
case DS_TYPE_ABSOLUTE:
status = snprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
break;
case DS_TYPE_ABSOLUTE:
status = snprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
@@
-620,9
+620,8
@@
static int rrd_cache_insert(const char *filename, const char *value,
return -1;
}
return -1;
}
- c_avl_get(cache, filename, (void *)&rc);
-
- if (rc == NULL) {
+ int status = c_avl_get(cache, filename, (void *)&rc);
+ if ((status != 0) || (rc == NULL)) {
rc = malloc(sizeof(*rc));
if (rc == NULL) {
pthread_mutex_unlock(&cache_lock);
rc = malloc(sizeof(*rc));
if (rc == NULL) {
pthread_mutex_unlock(&cache_lock);
@@
-794,7
+793,7
@@
static int rrd_write(const data_set_t *ds, const value_list_t *vl,
if (value_list_to_filename(filename, sizeof(filename), vl) != 0)
return -1;
if (value_list_to_filename(filename, sizeof(filename), vl) != 0)
return -1;
- char values[32 *
ds->ds_num
];
+ char values[32 *
(ds->ds_num + 1)
];
if (value_list_to_string(values, sizeof(values), ds, vl) != 0)
return -1;
if (value_list_to_string(values, sizeof(values), ds, vl) != 0)
return -1;
@@
-1036,8
+1035,7
@@
static int rrd_init(void) {
cache_flush_timeout = 0;
} else if (cache_flush_timeout < cache_timeout) {
INFO("rrdtool plugin: \"CacheFlush %.3f\" is less than \"CacheTimeout "
cache_flush_timeout = 0;
} else if (cache_flush_timeout < cache_timeout) {
INFO("rrdtool plugin: \"CacheFlush %.3f\" is less than \"CacheTimeout "
- "%.3f\". "
- "Ajusting \"CacheFlush\" to %.3f seconds.",
+ "%.3f\". Adjusting \"CacheFlush\" to %.3f seconds.",
CDTIME_T_TO_DOUBLE(cache_flush_timeout),
CDTIME_T_TO_DOUBLE(cache_timeout),
CDTIME_T_TO_DOUBLE(cache_timeout * 10));
CDTIME_T_TO_DOUBLE(cache_flush_timeout),
CDTIME_T_TO_DOUBLE(cache_timeout),
CDTIME_T_TO_DOUBLE(cache_timeout * 10));