projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3291 from dago/issue3220
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
d0849d1
..
bd5943c
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-120,7
+120,7
@@
static int srrd_update(char *filename, char *template, int argc,
return status;
} /* int srrd_update */
return status;
} /* int srrd_update */
-/* #endif HAVE_THREADSAFE_LIBRRD */
+
/* #endif HAVE_THREADSAFE_LIBRRD */
#else /* !HAVE_THREADSAFE_LIBRRD */
static int srrd_update(char *filename, char *template, int argc,
#else /* !HAVE_THREADSAFE_LIBRRD */
static int srrd_update(char *filename, char *template, int argc,
@@
-173,7
+173,7
@@
static int value_list_to_string_multiple(char *buffer, int buffer_len,
memset(buffer, '\0', buffer_len);
tt = CDTIME_T_TO_TIME_T(vl->time);
memset(buffer, '\0', buffer_len);
tt = CDTIME_T_TO_TIME_T(vl->time);
- status = snprintf(buffer, buffer_len, "%u", (unsigned int)tt);
+ status = s
s
nprintf(buffer, buffer_len, "%u", (unsigned int)tt);
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
@@
-186,17
+186,17
@@
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, ":%" PRIu64,
- (uint64_t)vl->values[i].counter);
+ status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+
(uint64_t)vl->values[i].counter);
else if (ds->ds[i].type == DS_TYPE_GAUGE)
else if (ds->ds[i].type == DS_TYPE_GAUGE)
- status = snprintf(buffer + offset, buffer_len - offset, ":" GAUGE_FORMAT,
- vl->values[i].gauge);
+ status = s
s
nprintf(buffer + offset, buffer_len - offset, ":" GAUGE_FORMAT,
+
vl->values[i].gauge);
else if (ds->ds[i].type == DS_TYPE_DERIVE)
else if (ds->ds[i].type == DS_TYPE_DERIVE)
- status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
- vl->values[i].derive);
+ status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
+
vl->values[i].derive);
else /*if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */
else /*if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */
- status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
- vl->values[i].absolute);
+ status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+
vl->values[i].absolute);
if ((status < 1) || (status >= (buffer_len - offset)))
return -1;
if ((status < 1) || (status >= (buffer_len - offset)))
return -1;
@@
-218,20
+218,20
@@
static int value_list_to_string(char *buffer, int buffer_len,
tt = CDTIME_T_TO_TIME_T(vl->time);
switch (ds->ds[0].type) {
case DS_TYPE_DERIVE:
tt = CDTIME_T_TO_TIME_T(vl->time);
switch (ds->ds[0].type) {
case DS_TYPE_DERIVE:
- status = snprintf(buffer, buffer_len, "%u:%" PRIi64, (unsigned)tt,
- vl->values[0].derive);
+ status = s
s
nprintf(buffer, buffer_len, "%u:%" PRIi64, (unsigned)tt,
+
vl->values[0].derive);
break;
case DS_TYPE_GAUGE:
break;
case DS_TYPE_GAUGE:
- status = snprintf(buffer, buffer_len, "%u:" GAUGE_FORMAT, (unsigned)tt,
- vl->values[0].gauge);
+ status = s
s
nprintf(buffer, buffer_len, "%u:" GAUGE_FORMAT, (unsigned)tt,
+
vl->values[0].gauge);
break;
case DS_TYPE_COUNTER:
break;
case DS_TYPE_COUNTER:
- status = snprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
- (uint64_t)vl->values[0].counter);
+ status = s
s
nprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
+
(uint64_t)vl->values[0].counter);
break;
case DS_TYPE_ABSOLUTE:
break;
case DS_TYPE_ABSOLUTE:
- status = snprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
- vl->values[0].absolute);
+ status = s
s
nprintf(buffer, buffer_len, "%u:%" PRIu64, (unsigned)tt,
+
vl->values[0].absolute);
break;
default:
return EINVAL;
break;
default:
return EINVAL;
@@
-566,9
+566,9
@@
static int rrd_cache_flush_identifier(cdtime_t timeout,
now = cdtime();
if (datadir == NULL)
now = cdtime();
if (datadir == NULL)
- snprintf(key, sizeof(key), "%s.rrd", identifier);
+ s
s
nprintf(key, sizeof(key), "%s.rrd", identifier);
else
else
- snprintf(key, sizeof(key), "%s/%s.rrd", datadir, identifier);
+ s
s
nprintf(key, sizeof(key), "%s/%s.rrd", datadir, identifier);
key[sizeof(key) - 1] = '\0';
status = c_avl_get(cache, key, (void *)&rc);
key[sizeof(key) - 1] = '\0';
status = c_avl_get(cache, key, (void *)&rc);