trace2: remove dead code in maybe_add_string_va()

jeffhostetler · gitster · commit 04f10d332f47 · 2019-08-08T10:39:44.000-07:00
Remove an unnecessary "if" block in maybe_add_string_va().

Commit "ad006fe419e trace2: NULL is not allowed for va_list"
changed "if (fmt &amp;&amp; *fmt &amp;&amp; ap)" to just "if (fmt &amp;&amp; *fmt)"
because it isn't safe to treat 'ap' as a pointer.  This made
the "if" block following it unnecessary.

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_event.c b/trace2/tr2_tgt_event.c
@@ -205,11 +205,6 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
 		strbuf_release(&buf);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		jw_object_string(jw, field_name, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
@@ -135,11 +135,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
 		va_end(copy_ap);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		strbuf_addstr(buf, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
@@ -239,11 +239,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
 		va_end(copy_ap);
 		return;
 	}
-
-	if (fmt && *fmt) {
-		strbuf_addstr(buf, fmt);
-		return;
-	}
 }
 
 static void fn_error_va_fl(const char *file, int line, const char *fmt,

Original file line number	Diff line number	Diff line change
`@@ -205,11 +205,6 @@ static void maybe_add_string_va(struct json_writer jw, const char field_name,`
`205`	`205`	`strbuf_release(&buf);`
`206`	`206`	`return;`
`207`	`207`	`}`
`208`		`-`
`209`		`- if (fmt && *fmt) {`
`210`		`- jw_object_string(jw, field_name, fmt);`
`211`		`- return;`
`212`		`- }`
`213`	`208`	`}`
`214`	`209`
`215`	`210`	`static void fn_error_va_fl(const char file, int line, const char fmt,`
Original file line number	Diff line number	Diff line change
`@@ -135,11 +135,6 @@ static void maybe_append_string_va(struct strbuf buf, const char fmt,`
`135`	`135`	`va_end(copy_ap);`
`136`	`136`	`return;`
`137`	`137`	`}`
`138`		`-`
`139`		`- if (fmt && *fmt) {`
`140`		`- strbuf_addstr(buf, fmt);`
`141`		`- return;`
`142`		`- }`
`143`	`138`	`}`
`144`	`139`
`145`	`140`	`static void fn_error_va_fl(const char file, int line, const char fmt,`
Original file line number	Diff line number	Diff line change
`@@ -239,11 +239,6 @@ static void maybe_append_string_va(struct strbuf buf, const char fmt,`
`239`	`239`	`va_end(copy_ap);`
`240`	`240`	`return;`
`241`	`241`	`}`
`242`		`-`
`243`		`- if (fmt && *fmt) {`
`244`		`- strbuf_addstr(buf, fmt);`
`245`		`- return;`
`246`		`- }`
`247`	`242`	`}`
`248`	`243`
`249`	`244`	`static void fn_error_va_fl(const char file, int line, const char fmt,`