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.h | |
| parent | 2850232a21fa1c2548d4e4df9dbfb51e6423dcce (diff) | |
| parent | ad006fe419efda47b0012347c5c2925f9a082101 (diff) | |
| download | git-e9bd21c3373278a9eabaf20cb60dbb6aa694e37e.tar.gz | |
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.h')
| -rw-r--r-- | trace2.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -238,7 +238,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo); * on this thread. */ void trace2_region_enter_fl(const char *file, int line, const char *category, - const char *label, const struct repository *repo); + const char *label, const struct repository *repo, ...); #define trace2_region_enter(category, label, repo) \ trace2_region_enter_fl(__FILE__, __LINE__, (category), (label), (repo)) @@ -278,7 +278,7 @@ void trace2_region_enter_printf(const char *category, const char *label, * in this nesting level. */ void trace2_region_leave_fl(const char *file, int line, const char *category, - const char *label, const struct repository *repo); + const char *label, const struct repository *repo, ...); #define trace2_region_leave(category, label, repo) \ trace2_region_leave_fl(__FILE__, __LINE__, (category), (label), (repo)) |