projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/2398'
[collectd.git]
/
src
/
rrdcached.c
diff --git
a/src/rrdcached.c
b/src/rrdcached.c
index
4efb1f0
..
8287013
100644
(file)
--- a/
src/rrdcached.c
+++ b/
src/rrdcached.c
@@
-75,7
+75,7
@@
static int value_list_to_string(char *buffer, int buffer_len,
memset(buffer, '\0', buffer_len);
t = CDTIME_T_TO_TIME_T(vl->time);
memset(buffer, '\0', buffer_len);
t = CDTIME_T_TO_TIME_T(vl->time);
- status = s
s
nprintf(buffer, buffer_len, "%lu", (unsigned long)t);
+ status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t);
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
@@
-88,17
+88,17
@@
static int value_list_to_string(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 = s
s
nprintf(buffer + offset, buffer_len - offset, ":%llu",
-
vl->values[i].counter);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%llu",
+ vl->values[i].counter);
} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%f",
-
vl->values[i].gauge);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%f",
+ vl->values[i].gauge);
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
-
vl->values[i].derive);
+ status = snprintf(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 = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
-
vl->values[i].absolute);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+ vl->values[i].absolute);
}
if ((status < 1) || (status >= (buffer_len - offset)))
}
if ((status < 1) || (status >= (buffer_len - offset)))
@@
-482,9
+482,9
@@
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
return EINVAL;
if (datadir != NULL)
return EINVAL;
if (datadir != NULL)
- s
s
nprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
+ snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
else
else
- s
s
nprintf(filename, sizeof(filename), "%s.rrd", identifier);
+ snprintf(filename, sizeof(filename), "%s.rrd", identifier);
rrd_clear_error();
status = rrdc_connect(daemon_address);
rrd_clear_error();
status = rrdc_connect(daemon_address);