Merge branch 'po/doc-branch' into maint

diff --git a/trace.h b/trace.h
index 4ca2a5a63fa2436da553d4e41781819e067f2e1f..9fa3e7a59407541d288da6ce2720279e2e23ab4e 100644 (file)
--- a/trace.h
+++ b/trace.h
@@ -133,18 +133,18 @@ void trace_performance_leave(const char *format, ...);
 /* backend functions, use non-*fl macros instead */
 __attribute__((format (printf, 4, 5)))
 void trace_printf_key_fl(const char *file, int line, struct trace_key *key,
-                               const char *format, ...);
+                        const char *format, ...);
 __attribute__((format (printf, 4, 5)))
 void trace_argv_printf_fl(const char *file, int line, const char **argv,
-                                const char *format, ...);
+                         const char *format, ...);
 void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
-                           const struct strbuf *data);
+                    const struct strbuf *data);
 __attribute__((format (printf, 4, 5)))
 void trace_performance_fl(const char *file, int line,
-                                uint64_t nanos, const char *fmt, ...);
+                         uint64_t nanos, const char *fmt, ...);
 __attribute__((format (printf, 4, 5)))
 void trace_performance_leave_fl(const char *file, int line,
-                                      uint64_t nanos, const char *fmt, ...);
+                               uint64_t nanos, const char *fmt, ...);
 static inline int trace_pass_fl(struct trace_key *key)
 {
        return key->fd || !key->initialized;