From cbef499f58d73e102d404d38496fa7e8361bd9c5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 17 Jun 2017 18:54:03 +0200 Subject: [PATCH] file: improve file_print() --- lib/nodes/file.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/nodes/file.c b/lib/nodes/file.c index 3fc50e1e6..f04d32751 100644 --- a/lib/nodes/file.c +++ b/lib/nodes/file.c @@ -205,21 +205,21 @@ char * file_print(struct node *n) ); if (f->read_rate) - strcatf(&buf, "rate=%.1f, ", f->read_rate); + strcatf(&buf, ", rate=%.1f", f->read_rate); } if (f->write.fmt) { - strcatf(&buf, "out=%s, mode=%s, ", + strcatf(&buf, ", out=%s, mode=%s", f->write.uri ? f->write.uri : f->write.fmt, f->write.mode ); } if (f->read_first.tv_sec || f->read_first.tv_nsec) - strcatf(&buf, "first=%.2f, ", time_to_double(&f->read_first)); + strcatf(&buf, ", first=%.2f", time_to_double(&f->read_first)); if (f->read_offset.tv_sec || f->read_offset.tv_nsec) - strcatf(&buf, "offset=%.2f, ", time_to_double(&f->read_offset)); + strcatf(&buf, ", offset=%.2f", time_to_double(&f->read_offset)); if ((f->read_first.tv_sec || f->read_first.tv_nsec) && (f->read_offset.tv_sec || f->read_offset.tv_nsec)) { @@ -229,12 +229,9 @@ char * file_print(struct node *n) eta = time_diff(&now, &eta); if (eta.tv_sec || eta.tv_nsec) - strcatf(&buf, "eta=%.2f sec, ", time_to_double(&eta)); + strcatf(&buf, ", eta=%.2f sec", time_to_double(&eta)); } - if (strlen(buf) > 2) - buf[strlen(buf) - 2] = 0; - return buf; }