Merge branch 'jh/trace2'
A few embarrassing bugfixes.
* jh/trace2:
trace2: fix up a missing "leave" entry point
trace2: fix incorrect function pointer check
diff --git a/read-cache.c b/read-cache.c
index 61b043b..4fad4e3 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -3131,7 +3131,7 @@
trace2_region_enter_printf("index", "shared/do_write_index",
the_repository, "%s", (*temp)->filename.buf);
ret = do_write_index(si->base, *temp, 1);
- trace2_region_enter_printf("index", "shared/do_write_index",
+ trace2_region_leave_printf("index", "shared/do_write_index",
the_repository, "%s", (*temp)->filename.buf);
if (ret)
diff --git a/trace2.c b/trace2.c
index eb759f3..c7b4f14 100644
--- a/trace2.c
+++ b/trace2.c
@@ -734,7 +734,7 @@
us_elapsed_region = tr2tls_region_elasped_self(us_now);
for_each_wanted_builtin (j, tgt_j)
- if (tgt_j->pfn_data_fl)
+ if (tgt_j->pfn_data_json_fl)
tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
us_elapsed_region, category,
repo, key, value);
