public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: "René Scharfe" <l.s.r@web•de>
Cc: dev <dev@cor0•com>,
	git@vger•kernel.org, Karsten Blees <karsten.blees@gmail•com>
Subject: Re: "trace.c", line 219: error: identifier redeclared: trace_strbuf
Date: Mon, 08 Sep 2014 11:11:37 -0700	[thread overview]
Message-ID: <xmqq7g1enfs6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <540B742F.5030700@web.de> ("René Scharfe"'s message of "Sat, 06 Sep 2014 22:53:03 +0200")

René Scharfe <l.s.r@web•de> 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 <dev@cor0•com>
> Signed-off-by: Rene Scharfe <l.s.r@web•de>
> ---
>  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.

     prev parent reply	other threads:[~2014-09-08 18:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-06 19:26 "trace.c", line 219: error: identifier redeclared: trace_strbuf dev
2014-09-06 20:53 ` René Scharfe
2014-09-07 17:19   ` dev
2014-09-08 18:11   ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq7g1enfs6.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=dev@cor0$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=karsten.blees@gmail$(echo .)com \
    --cc=l.s.r@web$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox