From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH v2 05/12] add_ref(): take a (struct ref_entry *) parameter Date: Fri, 28 Oct 2011 13:27:57 +0200 Message-ID: <1319801284-15625-6-git-send-email-mhagger@alum.mit.edu> References: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Drew Northup , Jakub Narebski , Heiko Voigt , Johan Herland , Julian Phillips , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Oct 28 13:28:46 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RJkc6-0002WA-Sc for gcvg-git-2@lo.gmane.org; Fri, 28 Oct 2011 13:28:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932425Ab1J1L2d (ORCPT ); Fri, 28 Oct 2011 07:28:33 -0400 Received: from mail.berlin.jpk.com ([212.222.128.130]:54968 "EHLO mail.berlin.jpk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755434Ab1J1L2O (ORCPT ); Fri, 28 Oct 2011 07:28:14 -0400 Received: from michael.berlin.jpk.com ([192.168.100.152]) by mail.berlin.jpk.com with esmtp (Exim 4.50) id 1RJkVI-0007Cx-Hy; Fri, 28 Oct 2011 13:21:40 +0200 X-Mailer: git-send-email 1.7.7 In-Reply-To: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Michael Haggerty Take a pointer to the ref_entry to add to the array, rather than creating the ref_entry within the function. This opens the way to having multiple kinds of ref_entries. Signed-off-by: Michael Haggerty --- refs.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 163ce91..c76d8b5 100644 --- a/refs.c +++ b/refs.c @@ -74,13 +74,8 @@ static struct ref_entry *create_ref_entry(const char *refname, } /* Add a ref_entry to the end of the ref_array (unsorted). */ -static void add_ref(const char *refname, const unsigned char *sha1, - int flag, struct ref_array *refs, - struct ref_entry **new_ref) +static void add_ref(struct ref_array *refs, struct ref_entry *ref) { - struct ref_entry *ref = create_ref_entry(refname, sha1, flag); - if (new_ref) - *new_ref = ref; ALLOC_GROW(refs->refs, refs->nr + 1, refs->alloc); refs->refs[refs->nr++] = ref; } @@ -265,7 +260,8 @@ static void read_packed_refs(FILE *f, struct ref_array *array) refname = parse_ref_line(refline, sha1); if (refname) { - add_ref(refname, sha1, flag, array, &last); + last = create_ref_entry(refname, sha1, flag); + add_ref(array, last); continue; } if (last && @@ -280,7 +276,7 @@ static void read_packed_refs(FILE *f, struct ref_array *array) void add_extra_ref(const char *refname, const unsigned char *sha1, int flag) { - add_ref(refname, sha1, flag, &extra_refs, NULL); + add_ref(&extra_refs, create_ref_entry(refname, sha1, flag)); } void clear_extra_refs(void) @@ -367,7 +363,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *base, hashclr(sha1); flag |= REF_ISBROKEN; } - add_ref(refname, sha1, flag, array, NULL); + add_ref(array, create_ref_entry(refname, sha1, flag)); } free(refname); closedir(dir); -- 1.7.7