From: Junio C Hamano <gitster@pobox•com>
To: Tanay Abhra <tanayabh@gmail•com>
Cc: git@vger•kernel.org, Ramkumar Ramachandra <artagnon@gmail•com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Subject: Re: [PATCH 1/7] config.c: fix accuracy of line number in errors
Date: Wed, 23 Jul 2014 14:49:43 -0700 [thread overview]
Message-ID: <xmqqegxbd9u0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1406140978-9472-2-git-send-email-tanayabh@gmail.com> (Tanay Abhra's message of "Wed, 23 Jul 2014 11:42:52 -0700")
Tanay Abhra <tanayabh@gmail•com> writes:
> If a callback returns a negative value to `git_config*()` family,
> they call `die()` while printing the line number and the file name.
> Currently the printed line number is off by one, thus printing the
> wrong line number.
>
> Make `linenr` point to the line we just parsed during the call
> to callback to get accurate line number in error messages.
>
> Discovered-by: Tanay Abhra <tanayabh@gmail•com>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Thanks.
I am not sure what to read in these two lines. Was the fix done by
you or Matthieu?
> ---
> config.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/config.c b/config.c
> index 22971e9..6db8f97 100644
> --- a/config.c
> +++ b/config.c
> @@ -244,6 +244,7 @@ static int get_next_char(void)
> cf->linenr++;
> if (c == EOF) {
> cf->eof = 1;
> + cf->linenr++;
> c = '\n';
> }
> return c;
> @@ -319,6 +320,7 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
> {
> int c;
> char *value;
> + int ret;
>
> /* Get the full name */
> for (;;) {
> @@ -341,7 +343,15 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
> if (!value)
> return -1;
> }
> - return fn(name->buf, value, data);
> + /*
> + * We already consumed the \n, but we need linenr to point to
> + * the line we just parsed during the call to fn to get
> + * accurate line number in error messages.
> + */
> + cf->linenr--;
> + ret = fn(name->buf, value, data);
> + cf->linenr++;
> + return ret;
> }
>
> static int get_extended_base_var(struct strbuf *name, int c)
next prev parent reply other threads:[~2014-07-23 21:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 18:42 [PATCH 0/7] Rewrite `git_config()` using config-set API Tanay Abhra
2014-07-23 18:42 ` [PATCH 1/7] config.c: fix accuracy of line number in errors Tanay Abhra
2014-07-23 21:49 ` Junio C Hamano [this message]
2014-07-24 13:33 ` Tanay Abhra
2014-07-24 18:31 ` Junio C Hamano
2014-07-24 18:40 ` Tanay Abhra
2014-07-24 18:49 ` Matthieu Moy
2014-07-23 18:42 ` [PATCH 2/7] rewrite git_config() to use the config-set API Tanay Abhra
2014-07-23 19:55 ` Matthieu Moy
2014-07-23 19:58 ` Matthieu Moy
2014-07-23 21:58 ` Junio C Hamano
2014-07-24 6:43 ` Matthieu Moy
2014-07-23 18:42 ` [PATCH 3/7] add a test for semantic errors in config files Tanay Abhra
2014-07-23 19:55 ` Matthieu Moy
2014-07-23 22:11 ` Junio C Hamano
2014-07-24 13:56 ` Tanay Abhra
2014-07-24 14:05 ` Matthieu Moy
2014-07-24 16:41 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 4/7] add line number and file name info to `config_set` Tanay Abhra
2014-07-23 22:24 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 5/7] enforce `xfuncname` precedence over `funcname` Tanay Abhra
2014-07-23 20:05 ` Matthieu Moy
2014-07-23 21:04 ` Eric Sunshine
2014-07-23 22:34 ` Junio C Hamano
2014-07-24 6:39 ` Matthieu Moy
2014-07-24 17:09 ` Junio C Hamano
2014-07-24 18:33 ` Tanay Abhra
2014-07-24 18:47 ` Matthieu Moy
2014-07-24 19:04 ` John Keeping
2014-07-24 19:20 ` Junio C Hamano
2014-07-24 19:29 ` Tanay Abhra
2014-07-24 19:54 ` Junio C Hamano
2014-07-24 21:22 ` Ramsay Jones
2014-07-25 3:16 ` Tanay Abhra
2014-07-25 6:54 ` Matthieu Moy
2014-07-25 17:09 ` Junio C Hamano
2014-07-25 17:45 ` Matthieu Moy
2014-07-25 18:55 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 6/7] config: add `git_die_config()` to the config-set API Tanay Abhra
2014-07-23 18:42 ` [PATCH 7/7] Add tests for `git_config_get_string()` Tanay Abhra
2014-07-23 20:08 ` Matthieu Moy
2014-07-23 19:38 ` [PATCH 0/7] Rewrite `git_config()` using config-set API Matthieu Moy
2014-07-23 21:44 ` Junio C Hamano
2014-07-24 15:04 ` Tanay Abhra
2014-07-24 15:39 ` Matthieu Moy
2014-07-24 15:59 ` Tanay Abhra
2014-07-24 16:17 ` Matthieu Moy
2014-07-24 20:03 ` Junio C Hamano
2014-07-24 15:06 ` [PATCH v12 1/2] add `config_set` API for caching config-like files Tanay Abhra
2014-07-24 18:41 ` Junio C Hamano
2014-07-24 15:09 ` [PATCH v12 2/2] test-config: add tests for the config_set API Tanay Abhra
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=xmqqegxbd9u0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=artagnon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=tanayabh@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox