public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
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 v9 5/8] config: add `git_die_config()` to the config-set API
Date: Thu, 07 Aug 2014 11:55:25 -0700	[thread overview]
Message-ID: <xmqqd2ccku3m.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1407412759-13833-6-git-send-email-tanayabh@gmail.com> (Tanay Abhra's message of "Thu, 7 Aug 2014 04:59:16 -0700")

Tanay Abhra <tanayabh@gmail•com> writes:

> diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
> index 21f280c..0d8b99b 100644
> --- a/Documentation/technical/api-config.txt
> +++ b/Documentation/technical/api-config.txt
> @@ -155,6 +155,19 @@ as well as retrieval for the queried variable, including:
>  	Similar to `git_config_get_string`, but expands `~` or `~user` into
>  	the user's home directory when found at the beginning of the path.
>  
> +`git_die_config(const char *key, const char *err, ...)`::
> +
> +	First prints the error message specified by the caller in `err` and then
> +	dies printing the line number and the file name of the highest priority
> +	value for the configuration variable `key`.

Reviewed with a wider context, I notice that this entry alone lacks
the return type.  I am assuming that this is just an oversight, and
adding 'void ' in front of the filename to match the next entry is
simple enough.

> +`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
> + ...
> +extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
> ...
> +NORETURN __attribute__((format(printf, 2, 3)))
> +void git_die_config(const char *key, const char *err, ...)
> +{

My first reaction was that it might make the compiler unhappy to
declare that the "err" is a printf-like format string and then to
allow some callers to pass NULL to the function.  My build however
does not seem to complain, so perhaps this is OK.

> +	const struct string_list *values;
> +	struct key_value_info *kv_info;
> +
> +	if (err) {
> +		va_list params;
> +		va_start(params, err);
> +		vreportf("error: ", err, params);
> +		va_end(params);
> +	}
> +	values = git_config_get_value_multi(key);
> +	kv_info = values->items[values->nr - 1].util;
> +	git_die_config_linenr(key, kv_info->filename, kv_info->linenr);
>  }
>  
>  /*

  reply	other threads:[~2014-08-07 18:55 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-07 11:59 [PATCH v9 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 1/8] config.c: mark error and warnings strings for translation Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 2/8] config.c: fix accuracy of line number in errors Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 3/8] add line number and file name info to `config_set` Tanay Abhra
2014-08-07 19:33   ` Ramsay Jones
2014-08-07 19:56     ` Matthieu Moy
2014-08-07 20:09       ` Junio C Hamano
2014-08-07 20:11         ` Matthieu Moy
2014-08-07 11:59 ` [PATCH v9 4/8] change `git_config()` return value to void Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 5/8] config: add `git_die_config()` to the config-set API Tanay Abhra
2014-08-07 18:55   ` Junio C Hamano [this message]
2014-08-08 12:14     ` Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 6/8] rewrite git_config() to use " Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 7/8] add a test for semantic errors in config files Tanay Abhra
2014-08-07 11:59 ` [PATCH v9 8/8] add tests for `git_config_get_string_const()` Tanay Abhra
2014-08-07 12:15 ` [PATCH v9 0/8] Rewrite `git_config()` using config-set API Matthieu Moy

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=xmqqd2ccku3m.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