From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH v5 02/25] sha1_name.c: hide get_sha1_with_context_1() ugliness Date: Tue, 3 Jul 2012 14:36:52 -0700 Message-ID: <1341351435-31011-3-git-send-email-gitster@pobox.com> References: <1341351435-31011-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jul 03 23:39:56 2012 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 1SmAp4-0007vc-N2 for gcvg-git-2@plane.gmane.org; Tue, 03 Jul 2012 23:39:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756584Ab2GCViD (ORCPT ); Tue, 3 Jul 2012 17:38:03 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:34798 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755850Ab2GCVhV (ORCPT ); Tue, 3 Jul 2012 17:37:21 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id CF6438620 for ; Tue, 3 Jul 2012 17:37:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references; s=sasl; bh=by4p //wRZl7d3tJlVa1/GtU/KjM=; b=MmbX4suvofE34o7/81SelupBorpzmanZ9Cc7 gOk17Tj62S/ww46FozcaO+f3i2v4yWapLCEHWxJbls/OveKlTVVH1D+8jwyZjsmq RzJ5cR5sgpy6eGSbajEHjjx1ZxVhiStfDsAGFBKi7WTid3v1KDxHBnaBrFYDCpRp zOgxJEo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:in-reply-to:references; q=dns; s=sasl; b=kfDaMF 31nJPJgPt+5QnHtwSCcyv367u7OEmz/JmS6p/wyTBiyaA5frHiLSTaXm2DqqLamv buh+FRYPNNDzDE9ZguFRWYcTw34py9oy1hIh3GknolY/kVqXW7Ax6dZRur2PiGtS 8IH8luBJwoz21bS8GvJHXJh2jDoUehoXwXUlQ= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id C4CB3861E for ; Tue, 3 Jul 2012 17:37:20 -0400 (EDT) Received: from pobox.com (unknown [98.234.214.94]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 4314A861D for ; Tue, 3 Jul 2012 17:37:20 -0400 (EDT) X-Mailer: git-send-email 1.7.11.1.229.g706c98f In-Reply-To: <1341351435-31011-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: 44AD1F3A-C557-11E1-A33F-FC762E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: There is no outside caller that cares about the "only-to-die" ugliness. Signed-off-by: Junio C Hamano --- cache.h | 6 +----- sha1_name.c | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cache.h b/cache.h index 10afd71..9ee470c 100644 --- a/cache.h +++ b/cache.h @@ -817,11 +817,7 @@ static inline int get_sha1_with_mode(const char *str, unsigned char *sha1, unsig { return get_sha1_with_mode_1(str, sha1, mode, 0, NULL); } -extern int get_sha1_with_context_1(const char *name, unsigned char *sha1, struct object_context *orc, int only_to_die, const char *prefix); -static inline int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc) -{ - return get_sha1_with_context_1(str, sha1, orc, 0, NULL); -} +extern int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc); /* * Try to read a SHA1 in hexadecimal format from the 40 characters diff --git a/sha1_name.c b/sha1_name.c index 5b0c845..10932bf 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -992,16 +992,6 @@ static void diagnose_invalid_index_path(int stage, } -int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode, - int only_to_die, const char *prefix) -{ - struct object_context oc; - int ret; - ret = get_sha1_with_context_1(name, sha1, &oc, only_to_die, prefix); - *mode = oc.mode; - return ret; -} - static char *resolve_relative_path(const char *rel) { if (prefixcmp(rel, "./") && prefixcmp(rel, "../")) @@ -1019,9 +1009,9 @@ static char *resolve_relative_path(const char *rel) rel); } -int get_sha1_with_context_1(const char *name, unsigned char *sha1, - struct object_context *oc, - int only_to_die, const char *prefix) +static int get_sha1_with_context_1(const char *name, unsigned char *sha1, + struct object_context *oc, + int only_to_die, const char *prefix) { int ret, bracket_depth; int namelen = strlen(name); @@ -1134,3 +1124,18 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1, } return ret; } + +int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode, + int only_to_die, const char *prefix) +{ + struct object_context oc; + int ret; + ret = get_sha1_with_context_1(name, sha1, &oc, only_to_die, prefix); + *mode = oc.mode; + return ret; +} + +int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc) +{ + return get_sha1_with_context_1(str, sha1, orc, 0, NULL); +} -- 1.7.11.1.229.g706c98f