Fourth batch

diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 2c97cf54be95e28373fd66cb195f82f98509b6a5..9bcac20d1b5a3da6a996c85adbaf4eb19ffb9f15 100644 (file)
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -193,7 +193,7 @@ static void fn_atexit(uint64_t us_elapsed_absolute, int code)
 static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
                                const char *fmt, va_list ap)
 {
-       if (fmt && *fmt && ap) {
+       if (fmt && *fmt) {
                va_list copy_ap;
                struct strbuf buf = STRBUF_INIT;
 
@@ -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,