Thread (1 message) 1 message, 1 author, 2016-06-15

Re: "trace.c", line 219: error: identifier redeclared: trace_strbuf

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:28

René Scharfe [off-list ref] writes:
quoted hunk
The issue was introduced with e05bed96 (trace: add 'file:line' to all
trace output).

-- >8 --
Subject: [PATCH] trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROS

Reported-by: dev <redacted>
Signed-off-by: Rene Scharfe <redacted>
---
 trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/trace.c b/trace.c
index 54aaee5..b6f25a2 100644
--- a/trace.c
+++ b/trace.c
@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char *format, ...)
 	va_end(ap);
 }
 
-void trace_strbuf(const char *key, const struct strbuf *data)
+void trace_strbuf(struct trace_key *key, const struct strbuf *data)
 {
 	trace_strbuf_fl(NULL, 0, key, data);
 }
Thanks.

Will queue on top of kb/perf-trace, hoping to merge it down later.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help