[PATCH v3 4/7] trace2: trim trailing whitespace in normal format error message

[Jeff Hostetler via GitGitGadget]

From: Jeff Hostetler <jeffh...@microsoft.com>

Avoid creating unnecessary trailing whitespace in normal
target format error messages when the message is omitted.

Signed-off-by: Jeff Hostetler <jeffh...@microsoft.com>
---
 trace2/tr2_tgt_normal.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 47a1882557..213724d5cb 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -142,8 +142,11 @@ static void fn_error_va_fl(const char *file, int line, 
const char *fmt,
 {
        struct strbuf buf_payload = STRBUF_INIT;
 
-       strbuf_addstr(&buf_payload, "error ");
-       maybe_append_string_va(&buf_payload, fmt, ap);
+       strbuf_addstr(&buf_payload, "error");
+       if (fmt && *fmt) {
+               strbuf_addch(&buf_payload, ' ');
+               maybe_append_string_va(&buf_payload, fmt, ap);
+       }
        normal_io_write_fl(file, line, &buf_payload);
        strbuf_release(&buf_payload);
 }
-- 
gitgitgadget