projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed gcc 7 format-truncation errors #2423
[collectd.git]
/
src
/
utils_tail_match.c
diff --git
a/src/utils_tail_match.c
b/src/utils_tail_match.c
index
242cc38
..
5062209
100644
(file)
--- a/
src/utils_tail_match.c
+++ b/
src/utils_tail_match.c
@@
-118,7
+118,7
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
sstrncpy(vl.type, data->type, sizeof(vl.type));
for (size_t i = 0; i < data->latency_config.percentile_num; i++) {
if (strlen(data->type_instance) != 0)
sstrncpy(vl.type, data->type, sizeof(vl.type));
for (size_t i = 0; i < data->latency_config.percentile_num; i++) {
if (strlen(data->type_instance) != 0)
- snprintf(vl.type_instance, sizeof(vl.type_instance), "%
s-%.0
f",
+ snprintf(vl.type_instance, sizeof(vl.type_instance), "%
.117s-%.2
f",
data->type_instance, data->latency_config.percentile[i]);
else
snprintf(vl.type_instance, sizeof(vl.type_instance), "%.0f",
data->type_instance, data->latency_config.percentile[i]);
else
snprintf(vl.type_instance, sizeof(vl.type_instance), "%.0f",
@@
-137,7
+137,11
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
}
/* Submit buckets */
}
/* Submit buckets */
- sstrncpy(vl.type, "bucket", sizeof(vl.type));
+ if (data->latency_config.bucket_type != NULL)
+ sstrncpy(vl.type, data->latency_config.bucket_type, sizeof(vl.type));
+ else
+ sstrncpy(vl.type, "bucket", sizeof(vl.type));
+
for (size_t i = 0; i < data->latency_config.buckets_num; i++) {
latency_bucket_t bucket = data->latency_config.buckets[i];
for (size_t i = 0; i < data->latency_config.buckets_num; i++) {
latency_bucket_t bucket = data->latency_config.buckets[i];
@@
-146,10
+150,10
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
bucket.upper_bound ? CDTIME_T_TO_DOUBLE(bucket.upper_bound) : INFINITY;
if (strlen(data->type_instance) != 0)
bucket.upper_bound ? CDTIME_T_TO_DOUBLE(bucket.upper_bound) : INFINITY;
if (strlen(data->type_instance) != 0)
- snprintf(vl.type_instance, sizeof(vl.type_instance), "%
s-%s-%g_%
g",
+ snprintf(vl.type_instance, sizeof(vl.type_instance), "%
.54s-%.54s-%.2g_%.2
g",
data->type, data->type_instance, lower_bound, upper_bound);
else
data->type, data->type_instance, lower_bound, upper_bound);
else
- snprintf(vl.type_instance, sizeof(vl.type_instance), "%
s-%g_%
g",
+ snprintf(vl.type_instance, sizeof(vl.type_instance), "%
.107s-%.2g_%.2
g",
data->type, lower_bound, upper_bound);
vl.values = &(value_t){
data->type, lower_bound, upper_bound);
vl.values = &(value_t){