Merge branch 'cb/fsmonitor-intfix' into maint

diff --git a/trace2.c b/trace2.c
index 6baa65cdf9aee65ff6ed5def968666800211e8e1..c7b4f14d29a9d0ef38fba7595d15911757b9cbdb 100644 (file)
--- a/trace2.c
+++ b/trace2.c
@@ -565,10 +565,14 @@ void trace2_region_enter_printf_va_fl(const char *file, int line,
 }
 
 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, ...)
 {
+       va_list ap;
+       va_start(ap, repo);
        trace2_region_enter_printf_va_fl(file, line, category, label, repo,
-                                        NULL, NULL);
+                                        NULL, ap);
+       va_end(ap);
+
 }
 
 void trace2_region_enter_printf_fl(const char *file, int line,
@@ -638,10 +642,13 @@ void trace2_region_leave_printf_va_fl(const char *file, int line,
 }
 
 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, ...)
 {
+       va_list ap;
+       va_start(ap, repo);
        trace2_region_leave_printf_va_fl(file, line, category, label, repo,
-                                        NULL, NULL);
+                                        NULL, ap);
+       va_end(ap);
 }
 
 void trace2_region_leave_printf_fl(const char *file, int line,
@@ -727,7 +734,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category,
        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);