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

From: Junio C Hamano <[email-masked]>
Date: Mon, 08 Sep 2014 11:11:37 -0700

René Scharfe <[email-masked]> writes:

> 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 <[email-masked]>
> Signed-off-by: Rene Scharfe <[email-masked]>
> ---
>  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.