diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:10 +0900 |
| commit | e9bd21c3373278a9eabaf20cb60dbb6aa694e37e (patch) | |
| tree | 9ad94b7ba9d3db3a9ec3666336c58742cc907c95 /trace2 | |
| parent | Merge branch 'tz/completion' (diff) | |
| parent | trace2: NULL is not allowed for va_list (diff) | |
| download | tgif-e9bd21c3373278a9eabaf20cb60dbb6aa694e37e.tar.xz | |
Merge branch 'tb/trace2-va-list-fix'
Fix some code that passed a NULL when a va_list was expected.
* tb/trace2-va-list-fix:
trace2: NULL is not allowed for va_list
Diffstat (limited to 'trace2')
| -rw-r--r-- | trace2/tr2_tgt_event.c | 2 | ||||
| -rw-r--r-- | trace2/tr2_tgt_normal.c | 2 | ||||
| -rw-r--r-- | trace2/tr2_tgt_perf.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c index 107cb5317d..1cf4f62441 100644 --- a/trace2/tr2_tgt_event.c +++ b/trace2/tr2_tgt_event.c @@ -190,7 +190,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; diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 547183d5b6..1a07d70abd 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -126,7 +126,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); diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index f0746fcf86..2a866d701b 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -211,7 +211,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); |