trace2: trim trailing whitespace in normal format error message
Avoid creating unnecessary trailing whitespace in normal target format error messages when the message is omitted. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Hostetler committed
Aug 8, 2019 at 07:19 UTC
ad43e37839ea6a3cf369af074a723a60cd66233b
1 file changed
+5
-2
trace2/tr2_tgt_normal.c
+5
-2
@@ -142,8 +142,11 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt,
142
{
143
struct strbuf buf_payload = STRBUF_INIT;
144
145
- strbuf_addstr(&buf_payload, "error ");
146
- maybe_append_string_va(&buf_payload, fmt, ap);
145
+ strbuf_addstr(&buf_payload, "error");
146
+ if (fmt && *fmt) {
147
+ strbuf_addch(&buf_payload, ' ');
148
+ maybe_append_string_va(&buf_payload, fmt, ap);
149
+ }
150
normal_io_write_fl(file, line, &buf_payload);
151
strbuf_release(&buf_payload);
152
}