git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Subject: [PATCH 09/24] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
Date: Thu,  7 Apr 2016 15:02:56 -0400	[thread overview]
Message-ID: <1460055791-23313-10-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1460055791-23313-1-git-send-email-dturner@twopensource.com>

From: Michael Haggerty <mhagger@alum.mit.edu>

The loop's there anyway; we might as well use it.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs/files-backend.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/refs/files-backend.c b/refs/files-backend.c
index c0cf6fd..101abba 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1400,8 +1400,8 @@ static const char *resolve_ref_1(const char *refname,
 				 struct strbuf *sb_path,
 				 struct strbuf *sb_contents)
 {
-	int depth = MAXDEPTH;
 	int bad_name = 0;
+	int symref_count;
 
 	if (flags)
 		*flags = 0;
@@ -1425,17 +1425,13 @@ static const char *resolve_ref_1(const char *refname,
 		 */
 		bad_name = 1;
 	}
-	for (;;) {
+
+	for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
 		const char *path;
 		struct stat st;
 		char *buf;
 		int fd;
 
-		if (--depth < 0) {
-			errno = ELOOP;
-			return NULL;
-		}
-
 		strbuf_reset(sb_path);
 		strbuf_git_path(sb_path, "%s", refname);
 		path = sb_path->buf;
@@ -1566,6 +1562,9 @@ static const char *resolve_ref_1(const char *refname,
 			bad_name = 1;
 		}
 	}
+
+	errno = ELOOP;
+	return NULL;
 }
 
 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-- 
2.4.2.767.g62658d5-twtrsrc

  parent reply	other threads:[~2016-04-07 19:04 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-07 19:02 [PATCH 00/24] Yet another pre-refs-backend series David Turner
2016-04-07 19:02 ` [PATCH 01/24] refs: move head_ref{,_submodule} to the common code David Turner
2016-04-07 19:02 ` [PATCH 02/24] refs: move for_each_*ref* functions into " David Turner
2016-04-07 19:02 ` [PATCH 03/24] t1430: test the output and error of some commands more carefully David Turner
2016-04-08 15:14   ` Michael Haggerty
2016-04-08 19:26     ` David Turner
2016-04-08 20:43       ` Junio C Hamano
2016-04-08 21:57         ` David Turner
2016-04-07 19:02 ` [PATCH 04/24] t1430: clean up broken refs/tags/shadow David Turner
2016-04-07 19:02 ` [PATCH 05/24] t1430: don't rely on symbolic-ref for creating broken symrefs David Turner
2016-04-07 19:02 ` [PATCH 06/24] t1430: test for-each-ref in the presence of badly-named refs David Turner
2016-04-07 19:02 ` [PATCH 07/24] t1430: improve test coverage of deletion " David Turner
2016-04-07 19:02 ` [PATCH 08/24] resolve_missing_loose_ref(): simplify semantics David Turner
2016-04-07 19:02 ` David Turner [this message]
2016-04-07 19:02 ` [PATCH 10/24] resolve_ref_unsafe(): ensure flags is always set David Turner
2016-04-07 19:02 ` [PATCH 11/24] resolve_ref_1(): eliminate local variable David Turner
2016-04-07 19:02 ` [PATCH 12/24] resolve_ref_1(): reorder code David Turner
2016-04-07 19:03 ` [PATCH 13/24] resolve_ref_1(): eliminate local variable "bad_name" David Turner
2016-04-07 19:03 ` [PATCH 14/24] files-backend: break out ref reading David Turner
2016-04-07 19:03 ` [PATCH 15/24] read_raw_ref(): manage own scratch space David Turner
2016-04-07 19:03 ` [PATCH 16/24] Inline resolve_ref_1() into resolve_ref_unsafe() David Turner
2016-04-07 19:03 ` [PATCH 17/24] read_raw_ref(): change flags parameter to unsigned int David Turner
2016-04-07 19:03 ` [PATCH 18/24] fsck_head_link(): remove unneeded flag variable David Turner
2016-04-07 19:03 ` [PATCH 19/24] cmd_merge(): " David Turner
2016-04-07 19:03 ` [PATCH 20/24] checkout_paths(): " David Turner
2016-04-07 19:03 ` [PATCH 21/24] check_aliased_update(): check that dst_name is non-NULL David Turner
2016-04-07 19:03 ` [PATCH 22/24] show_head_ref(): check the result of resolve_ref_namespace() David Turner
2016-04-07 19:03 ` [PATCH 23/24] refs: move resolve_ref_unsafe into common code David Turner
2016-04-07 19:03 ` [PATCH 24/24] refs: on symref reflog expire, lock symref not referrent David Turner
2016-04-07 22:29 ` [PATCH 00/24] Yet another pre-refs-backend series Junio C Hamano
2016-04-09 16:19 ` Michael Haggerty
2016-04-10  2:10   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460055791-23313-10-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).