From: David Turner Date: Thu, 07 Apr 2016 19:03:03 GMT Subject: [PATCH 16/24] Inline resolve_ref_1() into resolve_ref_unsafe() Message-ID: <1460055791-23313-17-git-send-email-dturner@twopensource.com> In-Reply-To: <1460055791-23313-1-git-send-email-dturner@twopensource.com> From: Michael Haggerty resolve_ref_unsafe() wasn't doing anything useful anymore. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index f752568..120b2dd 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1539,14 +1539,16 @@ out: } /* This function needs to return a meaningful errno on failure */ -static const char *resolve_ref_1(const char *refname, - int resolve_flags, - unsigned char *sha1, - int *flags, - struct strbuf *sb_refname) +const char *resolve_ref_unsafe(const char *refname, int resolve_flags, + unsigned char *sha1, int *flags) { + static struct strbuf sb_refname = STRBUF_INIT; + int unused_flags; int symref_count; + if (!flags) + flags = &unused_flags; + *flags = 0; if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { @@ -1570,7 +1572,7 @@ static const char *resolve_ref_1(const char *refname, for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) { int read_flags = 0; - if (read_raw_ref(refname, sha1, sb_refname, &read_flags)) { + if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) { *flags |= read_flags; if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING)) return NULL; @@ -1590,7 +1592,7 @@ static const char *resolve_ref_1(const char *refname, return refname; } - refname = sb_refname->buf; + refname = sb_refname.buf; if (resolve_flags & RESOLVE_REF_NO_RECURSE) { hashclr(sha1); return refname; @@ -1610,21 +1612,6 @@ static const char *resolve_ref_1(const char *refname, return NULL; } -const char *resolve_ref_unsafe(const char *refname, int resolve_flags, - unsigned char *sha1, int *flags) -{ - static struct strbuf sb_refname = STRBUF_INIT; - int unused_flags; - const char *ret; - - if (!flags) - flags = &unused_flags; - - ret = resolve_ref_1(refname, resolve_flags, sha1, flags, - &sb_refname); - return ret; -} - /* * Peel the entry (if possible) and return its new peel_status. If * repeel is true, re-peel the entry even if there is an old peeled -- 2.4.2.767.g62658d5-twtrsrc