trace2: trim trailing whitespace in normal format error message

jeffhostetler · gitster · commit ad43e37839ea · 2019-08-08T10:39:44.000-07:00
Avoid creating unnecessary trailing whitespace in normal
target format error messages when the message is omitted.

Signed-off-by: Jeff Hostetler &lt;jeffhost@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,11 @@ static void fn_error_va_fl(const char file, int line, const char fmt,`
`142`	`142`	`{`
`143`	`143`	`struct strbuf buf_payload = STRBUF_INIT;`
`144`	`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`	`+ }`
`147`	`150`	`normal_io_write_fl(file, line, &buf_payload);`
`148`	`151`	`strbuf_release(&buf_payload);`
`149`	`152`	`}`