From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation Date: Thu, 11 Jun 2015 21:39:56 +0530 Message-ID: <1434039003-10928-5-git-send-email-karthik.188@gmail.com> References: <5579B253.4020804@gmail.com> <1434039003-10928-1-git-send-email-karthik.188@gmail.com> Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jun 11 18:10:36 2015 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 1Z353r-0006Nc-Hf for gcvg-git-2@plane.gmane.org; Thu, 11 Jun 2015 18:10:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932070AbbFKQK3 (ORCPT ); Thu, 11 Jun 2015 12:10:29 -0400 Received: from mail-pd0-f193.google.com ([209.85.192.193]:34853 "EHLO mail-pd0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752955AbbFKQK0 (ORCPT ); Thu, 11 Jun 2015 12:10:26 -0400 Received: by pdbht2 with SMTP id ht2so2159917pdb.2 for ; Thu, 11 Jun 2015 09:10:26 -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=J4vJEK9OGndnZuTbx8uBvIlzwaxw64ufx1n/VU5q09k=; b=Tde1gknLV69obCfJoWcS9B5GOTutpCsD2abag5RjUf/xMkmGDhaf7YqyyUVYrT+vtu mMq9GXcA/kjlqPddQKspU9jl+DBw7dBcxEMEil1f56DNQa8MYrMGOLtaqI2jvMpdAMDD valsbJlam8Eh8T5qlSy500Edk8AoBlLMM59BrYuS6h8D7igJKvUcKGIKH4FH/ikhKWpv UdMpnkbsiB1ZuOLv8LGkZkOovxrWzECsJEZyLK5iTjM9jJWYv4lZQVCdGm/gqHcda180 FDnrn0Rdp828hBwviEHPjKy9GSx4IVApeCIX82BEx+S3SG6HZawDKttmMSgXZy3DzNz8 yH4g== X-Received: by 10.66.102.103 with SMTP id fn7mr16011436pab.85.1434039026238; Thu, 11 Jun 2015 09:10:26 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by mx.google.com with ESMTPSA id f4sm1132981pdc.95.2015.06.11.09.10.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Jun 2015 09:10:25 -0700 (PDT) X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434039003-10928-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 'ref_filter_cbdata' which will hold 'ref_filter' (conditions to filter the refs on) and 'ref_array' (the array of ref_array_items). Modify the code to use these new structures. This is a preparatory patch to eventually move code from 'for-each-ref' to 'ref-filter' and make it publicly available. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- builtin/for-each-ref.c | 54 ++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 8c44b49..913d757 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -39,6 +39,20 @@ struct ref_array_item { char *refname; }; +struct ref_array { + int nr, alloc; + struct ref_array_item **items; +}; + +struct ref_filter { + const char **name_patterns; +}; + +struct ref_filter_cbdata { + struct ref_array array; + struct ref_filter filter; +}; + static struct { const char *name; cmp_type cmp_type; @@ -844,12 +858,6 @@ static void get_value(struct ref_array_item *ref, int atom, struct atom_value ** *v = &ref->value[atom]; } -struct grab_ref_cbdata { - struct ref_array_item **grab_array; - const char **grab_pattern; - int grab_cnt; -}; - /* * Return 1 if the refname matches with one of the patterns, * otherwise 0. The patterns can be literal prefix (e.g. a @@ -895,7 +903,8 @@ static struct ref_array_item *new_ref_array_item(const char *refname, static int grab_single_ref(const char *refname, const struct object_id *oid, int flag, void *cb_data) { - struct grab_ref_cbdata *cb = cb_data; + struct ref_filter_cbdata *ref_cbdata = cb_data; + struct ref_filter *filter = &ref_cbdata->filter; struct ref_array_item *ref; if (flag & REF_BAD_NAME) { @@ -903,7 +912,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, return 0; } - if (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname)) + if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) return 0; /* @@ -913,8 +922,8 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, */ ref = new_ref_array_item(refname, oid->hash, flag); - REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1); - cb->grab_array[cb->grab_cnt++] = ref; + REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1); + ref_cbdata->array.items[ref_cbdata->array.nr++] = ref; return 0; } @@ -957,10 +966,10 @@ static int compare_refs(const void *a_, const void *b_) return 0; } -static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs) +static void sort_refs(struct ref_sort *sort, struct ref_array *array) { ref_sort = sort; - qsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs); + qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); } static void print_value(struct atom_value *v, int quote_style) @@ -1096,12 +1105,11 @@ static char const * const for_each_ref_usage[] = { int cmd_for_each_ref(int argc, const char **argv, const char *prefix) { - int i, num_refs; + int i; const char *format = "%(objectname) %(objecttype)\t%(refname)"; struct ref_sort *sort = NULL, **sort_tail = &sort; int maxcount = 0, quote_style = 0; - struct ref_array_item **refs; - struct grab_ref_cbdata cbdata; + struct ref_filter_cbdata ref_cbdata; struct option opts[] = { OPT_BIT('s', "shell", "e_style, @@ -1139,17 +1147,15 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) /* for warn_ambiguous_refs */ git_config(git_default_config, NULL); - memset(&cbdata, 0, sizeof(cbdata)); - cbdata.grab_pattern = argv; - for_each_rawref(grab_single_ref, &cbdata); - refs = cbdata.grab_array; - num_refs = cbdata.grab_cnt; + memset(&ref_cbdata, 0, sizeof(ref_cbdata)); + ref_cbdata.filter.name_patterns = argv; + for_each_rawref(grab_single_ref, &ref_cbdata); - sort_refs(sort, refs, num_refs); + sort_refs(sort, &ref_cbdata.array); - if (!maxcount || num_refs < maxcount) - maxcount = num_refs; + if (!maxcount || ref_cbdata.array.nr < maxcount) + maxcount = ref_cbdata.array.nr; for (i = 0; i < maxcount; i++) - show_ref(refs[i], format, quote_style); + show_ref(ref_cbdata.array.items[i], format, quote_style); return 0; } -- 2.4.2