From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tanay Abhra Subject: [PATCH v8 3/8] add line number and file name info to `config_set` Date: Wed, 6 Aug 2014 07:53:07 -0700 Message-ID: <1407336792-16962-4-git-send-email-tanayabh@gmail.com> References: <1407336792-16962-1-git-send-email-tanayabh@gmail.com> Cc: Tanay Abhra , Ramkumar Ramachandra , Matthieu Moy , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Aug 06 17:00:57 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XF2i0-0008S1-IP for gcvg-git-2@plane.gmane.org; Wed, 06 Aug 2014 17:00:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754225AbaHFPAx (ORCPT ); Wed, 6 Aug 2014 11:00:53 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:63418 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754004AbaHFPAw (ORCPT ); Wed, 6 Aug 2014 11:00:52 -0400 Received: by mail-pd0-f177.google.com with SMTP id p10so3429596pdj.22 for ; Wed, 06 Aug 2014 08:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vBMRh3pScM7VFOfEXb0sEm0ZjnQFr6NY+M/DQrht0H0=; b=lK3lAPx6z3gRopeDsmlRkuQQXwQHFD8bY9wMDHCAcdx2ANUnanBdpU1KvoHMr+PMVz dCX1w4G6WzB2AsAhO28TUF9Bo840gWMdETP0AGENdPGvkcrX00Y0r/Nme5i9MJxQOTXZ 5WUpa5fOmg/APRlCVv3x/dVXkSky43lJzF6IN1Lv5cyAWx9pkNGfqzfwa1ntjJTM2HVf OuY8PGSheT/BKNMyooLRvX8hOB3/bLwZtTlx3hsbUpanBG8ghsGdWilIYEtcQxgsNT9m JZn8q42oKGzVmHBwICEIvORqytJogeUrK29qrnuug1roCe6i0ozvv2ONU/OJ5g9wmxci /02A== X-Received: by 10.70.35.15 with SMTP id d15mr11821402pdj.48.1407337251988; Wed, 06 Aug 2014 08:00:51 -0700 (PDT) Received: from localhost.localdomain ([223.176.214.188]) by mx.google.com with ESMTPSA id u2sm1547305pbs.42.2014.08.06.08.00.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Aug 2014 08:00:51 -0700 (PDT) X-Mailer: git-send-email 1.9.0.GIT In-Reply-To: <1407336792-16962-1-git-send-email-tanayabh@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Store file name and line number for each key-value pair in the cache during parsing of the configuration files. Signed-off-by: Tanay Abhra --- cache.h | 5 +++++ config.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cache.h b/cache.h index 7292aef..0b1bdfd 100644 --- a/cache.h +++ b/cache.h @@ -1383,6 +1383,11 @@ extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest); extern int git_config_get_maybe_bool(const char *key, int *dest); extern int git_config_get_pathname(const char *key, const char **dest); +struct key_value_info { + const char *filename; + int linenr; +}; + extern int committer_ident_sufficiently_given(void); extern int author_ident_sufficiently_given(void); diff --git a/config.c b/config.c index bb4629e..e4d745e 100644 --- a/config.c +++ b/config.c @@ -1260,6 +1260,9 @@ static struct config_set_element *configset_find_element(struct config_set *cs, static int configset_add_value(struct config_set *cs, const char *key, const char *value) { struct config_set_element *e; + struct string_list_item *si; + struct key_value_info *kv_info = xmalloc(sizeof(*kv_info)); + e = configset_find_element(cs, key); /* * Since the keys are being fed by git_config*() callback mechanism, they @@ -1272,7 +1275,16 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha string_list_init(&e->value_list, 1); hashmap_add(&cs->config_hash, e); } - string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL); + si = string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL); + if (cf) { + kv_info->filename = strintern(cf->name); + kv_info->linenr = cf->linenr; + } else { + /* for values read from `git_config_from_parameters()` */ + kv_info->filename = NULL; + kv_info->linenr = -1; + } + si->util = kv_info; return 0; } @@ -1299,7 +1311,7 @@ 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); } hashmap_free(&cs->config_hash, 1); cs->hash_initialized = 0; -- 1.9.0.GIT