[PATCH v3 3/7] trace2: remove dead code in maybe_add_string_va()

[Jeff Hostetler via GitGitGadget]

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

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 <jeffh...@microsoft.com>
---
 trace2/tr2_tgt_event.c  | 5 -----
 trace2/tr2_tgt_normal.c | 5 -----
 trace2/tr2_tgt_perf.c   | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index c2852d1bd2..9bcac20d1b 100644
--- 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
index 00b116d797..47a1882557 100644
--- 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
index fb845cb627..8e52395de2 100644
--- 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,
-- 
gitgitgadget