From 5e6fec26ae1775ece36d7e43d36891736fdadb30 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 3 Sep 2019 21:21:11 +0200 Subject: [PATCH] signal: refactor signal_data_snprint() -> signal_data_print_str() --- include/villas/signal.h | 2 +- lib/formats/csv.cpp | 2 +- lib/formats/villas_human.cpp | 2 +- lib/signal.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/villas/signal.h b/include/villas/signal.h index 33989f5ba..8e33d3303 100644 --- a/include/villas/signal.h +++ b/include/villas/signal.h @@ -134,7 +134,7 @@ enum SignalType signal_type_detect(const char *val); void signal_data_cast(union signal_data *data, const struct signal *from, const struct signal *to); /** Print value of a signal to a character buffer. */ -int signal_data_snprint(const union signal_data *data, const struct signal *sig, char *buf, size_t len); +int signal_data_print_str(const union signal_data *data, const struct signal *sig, char *buf, size_t len); int signal_data_parse_str(union signal_data *data, const struct signal *sig, const char *ptr, char **end); diff --git a/lib/formats/csv.cpp b/lib/formats/csv.cpp index 64ef38634..26b82d0df 100644 --- a/lib/formats/csv.cpp +++ b/lib/formats/csv.cpp @@ -66,7 +66,7 @@ static size_t csv_sprint_single(struct io *io, char *buf, size_t len, const stru break; off += snprintf(buf + off, len - off, "%c", io->separator); - off += signal_data_snprint(&smp->data[i], sig, buf + off, len - off); + off += signal_data_print_str(&smp->data[i], sig, buf + off, len - off); } } diff --git a/lib/formats/villas_human.cpp b/lib/formats/villas_human.cpp index f34880a99..f573a4f06 100644 --- a/lib/formats/villas_human.cpp +++ b/lib/formats/villas_human.cpp @@ -62,7 +62,7 @@ static size_t villas_human_sprint_single(struct io *io, char *buf, size_t len, c break; off += snprintf(buf + off, len - off, "%c", io->separator); - off += signal_data_snprint(&smp->data[i], sig, buf + off, len - off); + off += signal_data_print_str(&smp->data[i], sig, buf + off, len - off); } } diff --git a/lib/signal.cpp b/lib/signal.cpp index 0478d114a..a60e06383 100644 --- a/lib/signal.cpp +++ b/lib/signal.cpp @@ -338,7 +338,7 @@ void signal_list_dump(const struct vlist *list, const union signal_data *data, u if (data && i < len) { char val[32]; - signal_data_snprint(&data[i], sig, val, sizeof(val)); + signal_data_print_str(&data[i], sig, val, sizeof(val)); strcatf(&buf, " = %s", val); } @@ -652,7 +652,7 @@ int signal_data_parse_json(union signal_data *data, const struct signal *sig, js return 0; } -int signal_data_snprint(const union signal_data *data, const struct signal *sig, char *buf, size_t len) +int signal_data_print_str(const union signal_data *data, const struct signal *sig, char *buf, size_t len) { switch (sig->type) { case SignalType::FLOAT: