From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Tanay Abhra <tanayabh@gmail•com>
Cc: git@vger•kernel.org, Ramkumar Ramachandra <artagnon@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v2 3/6] rewrite git_config() to use the config-set API
Date: Fri, 25 Jul 2014 15:58:58 +0200 [thread overview]
Message-ID: <vpq38dppmjh.fsf@anie.imag.fr> (raw)
In-Reply-To: <1406293095-15920-4-git-send-email-tanayabh@gmail.com> (Tanay Abhra's message of "Fri, 25 Jul 2014 05:58:12 -0700")
Tanay Abhra <tanayabh@gmail•com> writes:
> +struct config_set_element {
> + struct hashmap_entry ent;
> + char *key;
> + struct string_list value_list;
> +};
> +
> +struct configset_list_item {
> + struct config_set_element *e;
> + int value_index;
> +};
I originally wondered why you had two levels of pointers, but
config_set_element is not new, just moved. It's OK.
> +/*
> + * the contents of the list are ordered according to their
> + * position in the config files and order of parsing the files.
> + * (i.e. key-value pair at the last position of .git/config will
> + * be at the last item of the list)
> + */
> +
> +struct configset_list {
I wouldn't put a blank line between comment and decl if the comment
applies to the decl.
> -int git_config(config_fn_t fn, void *data)
> +static int git_config_raw(config_fn_t fn, void *data)
> {
> return git_config_with_options(fn, data, NULL, 1);
> }
I would have done this and the new git_config() as a separate patch, but
I do not mind strongly.
> static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
> {
> struct config_set_element k;
> @@ -1268,6 +1295,7 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
> {
> struct config_set_element *e;
> struct string_list_item *si;
> + struct configset_list_item *l_item;
> struct key_value_info *kv_info = xmalloc(sizeof(*kv_info));
>
> e = configset_find_element(cs, key);
> @@ -1283,6 +1311,13 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
> hashmap_add(&cs->config_hash, e);
> }
> si = string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL);
> +
> + if (cs->list.nr + 1 > cs->list.alloc)
The "if" is already in ALLOC_GROW.
> + ALLOC_GROW(cs->list.items, cs->list.nr + 20, cs->list.alloc);
The 20 should be just 1 I guess. You're adding 1 element, and ALLOC_GROW
will take care of allocating more than 1 for you (see alloc_nr and
ALLOC_GROW's defs in cache.h).
> @@ -1318,10 +1356,14 @@ void git_configset_clear(struct config_set *cs)
> hashmap_iter_init(&cs->config_hash, &iter);
> while ((entry = hashmap_iter_next(&iter))) {
> free(entry->key);
> - string_list_clear(&entry->value_list, 0);
> + string_list_clear(&entry->value_list, 1);
Doesn't this change belong to PATCH 2/6 ?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2014-07-25 14:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 12:58 [PATCH v2 0/6] Rewrite `git_config()` using config-set API Tanay Abhra
2014-07-25 12:58 ` [PATCH v2 1/6] config.c: fix accuracy of line number in errors Tanay Abhra
2014-07-25 12:58 ` [PATCH v2 2/6] add line number and file name info to `config_set` Tanay Abhra
2014-07-25 12:58 ` [PATCH v2 3/6] rewrite git_config() to use the config-set API Tanay Abhra
2014-07-25 13:58 ` Matthieu Moy [this message]
2014-07-25 14:07 ` Tanay Abhra
2014-07-25 12:58 ` [PATCH v2 4/6] add a test for semantic errors in config files Tanay Abhra
2014-07-25 12:58 ` [PATCH v2 5/6] config: add `git_die_config()` to the config-set API Tanay Abhra
2014-07-25 14:03 ` Matthieu Moy
2014-07-25 14:12 ` Tanay Abhra
2014-07-25 17:29 ` Junio C Hamano
2014-07-25 12:58 ` [PATCH v2 6/6] Add tests for `git_config_get_string()` 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=vpq38dppmjh.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=artagnon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--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