From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v4 04/12] ref-filter: introduce struct used_atom Date: Sun, 31 Jan 2016 23:12:48 +0530 Message-ID: <1454262176-6594-5-git-send-email-Karthik.188@gmail.com> References: <1454262176-6594-1-git-send-email-Karthik.188@gmail.com> Cc: gitster@pobox.com, sunshine@sunshineco.com, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 31 18:43:07 2016 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 1aPw1h-0008My-Nn for gcvg-git-2@plane.gmane.org; Sun, 31 Jan 2016 18:43:06 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932783AbcAaRm7 (ORCPT ); Sun, 31 Jan 2016 12:42:59 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:36155 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932149AbcAaRm2 (ORCPT ); Sun, 31 Jan 2016 12:42:28 -0500 Received: by mail-pa0-f66.google.com with SMTP id y7so42419paa.3 for ; Sun, 31 Jan 2016 09:42:28 -0800 (PST) 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=NiiIQ7QVpslKNOoOIiMAcvjamz8Dc3dV+eex8PODm0E=; b=q3CrLVtuq046W9hKYr1gP8qA1n+3+P9F2eWAkByhzzmF35fnnSImJjXSqCKCwgLqTW /6ItPr80ybuzk1UW5lj3noxyahYqDkJgiwhp2HCTKrb7zd55vZAfbNW4WWna4G10UPUw NxklJLzdqsi0EeyZzLfkMIVCH4Xy9RHmvbG0cjMzIho5CYaJONLh9osYgLU+WsInC78L seReoRe6XB8yyWql1++cfXcnwR7KpzYAhBBh6Fd/4gUW+wrR08mSIDEzVZBVKe2Z9qXN FVt89wv6Z+dccr3SGaxPUgHTAVB+r4B59BwRWVQkFtt5hCs9F2DFMEjt7GjE8ZZn8rkE Kwww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NiiIQ7QVpslKNOoOIiMAcvjamz8Dc3dV+eex8PODm0E=; b=bHraDsKJjp1L1sTS2+rkeYNv6i578N5ZdbjIlYaWQpYZND7BjfzoO73MIN7EQDHpxR /+5ivvoeejDsOEiWVURLpz6J2pRSxPgVLnc4JnWs5QRIZCAIElihFvIpFTd/Qwrgl3rf fsAmqtwGn3YwwQSka/0dTnybNVmDD6nXot16qPzrmgcHGKuZmzpkVUjNzo3LCutZfMUd HrIS+mHkFT75YiK5CxofxQJWu8qYSKkHc1zwaietZqjS5qIjfu7Ck1v0J69BquyOimOB inHrhjM0iD6YxgxGl0d/GSpIE68S1lyGID3fYWBEorgoUJMkKRMkqT+CebGZLuEEm+LH MX+w== X-Gm-Message-State: AG10YORFzT/3f2ch7ztuujBcDtQYOPw5wmzKxrEQeStsZvChgPDQ2wrbFO8Bc7ADzL3Y8A== X-Received: by 10.66.132.81 with SMTP id os17mr31086151pab.98.1454262148081; Sun, 31 Jan 2016 09:42:28 -0800 (PST) Received: from ashley.localdomain ([106.51.132.212]) by smtp.gmail.com with ESMTPSA id v26sm37274012pfi.56.2016.01.31.09.42.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 Jan 2016 09:42:27 -0800 (PST) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454262176-6594-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Introduce the 'used_atom' structure to replace the existing implementation of 'used_atom' (which is a list of atoms). This helps us parse atoms beforehand and store required details into the 'used_atom' for future usage. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index c3a8372..3736dc3 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -26,8 +26,10 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type; * indexed with the "atom number", which is an index into this * array. */ -static const char **used_atom; -static cmp_type *used_atom_type; +static struct used_atom { + const char *name; + cmp_type type; +} *used_atom; static int used_atom_cnt, need_tagged, need_symref; static int need_color_reset_at_eol; @@ -122,8 +124,8 @@ int parse_ref_filter_atom(const char *atom, const char *ep) /* Do we have the atom already used elsewhere? */ for (i = 0; i < used_atom_cnt; i++) { - int len = strlen(used_atom[i]); - if (len == ep - atom && !memcmp(used_atom[i], atom, len)) + int len = strlen(used_atom[i].name); + if (len == ep - atom && !memcmp(used_atom[i].name, atom, len)) return i; } @@ -150,12 +152,11 @@ int parse_ref_filter_atom(const char *atom, const char *ep) at = used_atom_cnt; used_atom_cnt++; REALLOC_ARRAY(used_atom, used_atom_cnt); - REALLOC_ARRAY(used_atom_type, used_atom_cnt); - used_atom[at] = xmemdupz(atom, ep - atom); - used_atom_type[at] = valid_atom[i].cmp_type; + used_atom[at].name = xmemdupz(atom, ep - atom); + used_atom[at].type = valid_atom[i].cmp_type; if (*atom == '*') need_tagged = 1; - if (!strcmp(used_atom[at], "symref")) + if (!strcmp(used_atom[at].name, "symref")) need_symref = 1; return at; } @@ -315,7 +316,7 @@ int verify_ref_format(const char *format) at = parse_ref_filter_atom(sp + 2, ep); cp = ep + 1; - if (skip_prefix(used_atom[at], "color:", &color)) + if (skip_prefix(used_atom[at].name, "color:", &color)) need_color_reset_at_eol = !!strcmp(color, "reset"); } return 0; @@ -359,7 +360,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct object int i; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -383,7 +384,7 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob struct tag *tag = (struct tag *) obj; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -405,7 +406,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object struct commit *commit = (struct commit *) obj; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -535,7 +536,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru const char *wholine = NULL; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -573,7 +574,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru if (!wholine) return; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -663,7 +664,7 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &val[i]; const char *valp = NULL; if (!!deref != (*name == '*')) @@ -809,7 +810,7 @@ static void populate_value(struct ref_array_item *ref) /* Fill in specials first */ for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; + const char *name = used_atom[i].name; struct atom_value *v = &ref->value[i]; int deref = 0; const char *refname; @@ -1464,7 +1465,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru { struct atom_value *va, *vb; int cmp; - cmp_type cmp_type = used_atom_type[s->atom]; + cmp_type cmp_type = used_atom[s->atom].type; get_ref_atom_value(a, s->atom, &va); get_ref_atom_value(b, s->atom, &vb); -- 2.7.0