Merge branch 'nd/merge-quit'

diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index 328d2234bddf045685e86c53c140790f9ba9bcf8..ea0cbbe13ee06629b2619704a4f9ae6714dc1b7d 100644 (file)
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -212,7 +212,7 @@ static void fn_atexit(uint64_t us_elapsed_absolute, int code)
 static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
                                   va_list ap)
 {
-       if (fmt && *fmt && ap) {
+       if (fmt && *fmt) {
                va_list copy_ap;
 
                va_copy(copy_ap, ap);