trace2: remove dead code in maybe_add_string_va()
Remove an unnecessary "if" block in maybe_add_string_va(). Commit "ad006fe419e trace2: NULL is not allowed for va_list" changed "if (fmt && *fmt && ap)" to just "if (fmt && *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 <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Hostetler committed
Aug 8, 2019 at 07:19 UTC
04f10d332f47aed7d93ff3ed5c2bb3a366e44693
3 files changed
-15
trace2/tr2_tgt_event.c
-5
@@ -205,11 +205,6 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
205
strbuf_release(&buf);
206
return;
207
}
208
-
209
- if (fmt && *fmt) {
210
- jw_object_string(jw, field_name, fmt);
211
- return;
212
- }
208
}
209
210
static void fn_error_va_fl(const char *file, int line, const char *fmt,
trace2/tr2_tgt_normal.c
-5
@@ -135,11 +135,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
135
va_end(copy_ap);
136
return;
137
}
138
-
139
- if (fmt && *fmt) {
140
- strbuf_addstr(buf, fmt);
141
- return;
142
- }
138
}
139
140
static void fn_error_va_fl(const char *file, int line, const char *fmt,
trace2/tr2_tgt_perf.c
-5
@@ -239,11 +239,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
239
va_end(copy_ap);
240
return;
241
}
242
-
243
- if (fmt && *fmt) {
244
- strbuf_addstr(buf, fmt);
245
- return;
246
- }
242
}
243
244
static void fn_error_va_fl(const char *file, int line, const char *fmt,