git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 10/24] resolve_ref_unsafe(): ensure flags is always set

From
David Turner <dturner@twopensource.com>
Date
Apr 7, 2016, 19:02 UTC
Message-ID
<1460055791-23313-11-git-send-email-dturner@twopensource.com>
In-Reply-To
<1460055791-23313-1-git-send-email-dturner@twopensource.com>
From: Michael Haggerty <mhagger@alum.mit.edu>

If the caller passes flags==NULL, then set it to point at a local scratch variable. This removes the need for a lot of "if (flags)" guards in resolve_ref_1() and resolve_missing_loose_ref().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs/files-backend.c | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 101abba..067ce1c 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1383,8 +1383,7 @@ static int resolve_missing_loose_ref(const char *refname,
 	entry = get_packed_ref(refname);
 	if (entry) {
 		hashcpy(sha1, entry->u.value.oid.hash);
-		if (flags)
-			*flags |= REF_ISPACKED;
+		*flags |= REF_ISPACKED;
 		return 0;
 	}
 	/* refname is not a packed reference. */
@@ -1403,12 +1402,10 @@ static const char *resolve_ref_1(const char *refname,
 	int bad_name = 0;
 	int symref_count;
 
-	if (flags)
-		*flags = 0;
+	*flags = 0;
 
 	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-		if (flags)
-			*flags |= REF_BAD_NAME;
+		*flags |= REF_BAD_NAME;
 
 		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
 		    !refname_is_safe(refname)) {
@@ -1458,8 +1455,7 @@ static const char *resolve_ref_1(const char *refname,
 			}
 			if (bad_name) {
 				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
+				*flags |= REF_ISBROKEN;
 			}
 			return refname;
 		}
@@ -1478,8 +1474,7 @@ static const char *resolve_ref_1(const char *refname,
 			    !check_refname_format(sb_contents->buf, 0)) {
 				strbuf_swap(sb_refname, sb_contents);
 				refname = sb_refname->buf;
-				if (flags)
-					*flags |= REF_ISSYMREF;
+				*flags |= REF_ISSYMREF;
 				if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
 					hashclr(sha1);
 					return refname;
@@ -1526,20 +1521,17 @@ static const char *resolve_ref_1(const char *refname,
 			 */
 			if (get_sha1_hex(sb_contents->buf, sha1) ||
 			    (sb_contents->buf[40] != '\0' && !isspace(sb_contents->buf[40]))) {
-				if (flags)
-					*flags |= REF_ISBROKEN;
+				*flags |= REF_ISBROKEN;
 				errno = EINVAL;
 				return NULL;
 			}
 			if (bad_name) {
 				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
+				*flags |= REF_ISBROKEN;
 			}
 			return refname;
 		}
-		if (flags)
-			*flags |= REF_ISSYMREF;
+		*flags |= REF_ISSYMREF;
 		buf = sb_contents->buf + 4;
 		while (isspace(*buf))
 			buf++;
@@ -1551,8 +1543,7 @@ static const char *resolve_ref_1(const char *refname,
 			return refname;
 		}
 		if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {
-			if (flags)
-				*flags |= REF_ISBROKEN;
+			*flags |= REF_ISBROKEN;
 
 			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
 			    !refname_is_safe(buf)) {
@@ -1573,8 +1564,12 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 	static struct strbuf sb_refname = STRBUF_INIT;
 	struct strbuf sb_contents = STRBUF_INIT;
 	struct strbuf sb_path = STRBUF_INIT;
+	int unused_flags;
 	const char *ret;
 
+	if (!flags)
+		flags = &unused_flags;
+
 	ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
 			    &sb_refname, &sb_path, &sb_contents);
 	strbuf_release(&sb_path);

-- 
2.4.2.767.g62658d5-twtrsrc
Previous: David TurnerNext: David Turner
Message 15 of 32 in “Yet another pre-refs-backend series”
  1. 00/24 Yet another pre-refs-backend seriesDavid Turner, Apr 7, 2016
  2. 01/24 refs: move head_ref{,_submodule} to the common codeDavid Turner, Apr 7, 2016
  3. 02/24 refs: move for_each_*ref* functions into common codeDavid Turner, Apr 7, 2016
  4. 03/24 t1430: test the output and error of some commands more carefullyDavid Turner, Apr 7, 2016
  5. Michael HaggertyApr 8, 2016
  6. David TurnerApr 8, 2016
  7. Junio C HamanoApr 8, 2016
  8. David TurnerApr 8, 2016
  9. 04/24 t1430: clean up broken refs/tags/shadowDavid Turner, Apr 7, 2016
  10. 05/24 t1430: don't rely on symbolic-ref for creating broken symrefsDavid Turner, Apr 7, 2016
  11. 06/24 t1430: test for-each-ref in the presence of badly-named refsDavid Turner, Apr 7, 2016
  12. 07/24 t1430: improve test coverage of deletion of badly-named refsDavid Turner, Apr 7, 2016
  13. 08/24 resolve_missing_loose_ref(): simplify semanticsDavid Turner, Apr 7, 2016
  14. 09/24 resolve_ref_unsafe(): use for loop to count up to MAXDEPTHDavid Turner, Apr 7, 2016
  15. 10/24 resolve_ref_unsafe(): ensure flags is always setDavid Turner, Apr 7, 2016
  16. 11/24 resolve_ref_1(): eliminate local variableDavid Turner, Apr 7, 2016
  17. 12/24 resolve_ref_1(): reorder codeDavid Turner, Apr 7, 2016
  18. 13/24 resolve_ref_1(): eliminate local variable "bad_name"David Turner, Apr 7, 2016
  19. 14/24 files-backend: break out ref readingDavid Turner, Apr 7, 2016
  20. 15/24 read_raw_ref(): manage own scratch spaceDavid Turner, Apr 7, 2016
  21. 16/24 Inline resolve_ref_1() into resolve_ref_unsafe()David Turner, Apr 7, 2016
  22. 17/24 read_raw_ref(): change flags parameter to unsigned intDavid Turner, Apr 7, 2016
  23. 18/24 fsck_head_link(): remove unneeded flag variableDavid Turner, Apr 7, 2016
  24. 19/24 cmd_merge(): remove unneeded flag variableDavid Turner, Apr 7, 2016
  25. 20/24 checkout_paths(): remove unneeded flag variableDavid Turner, Apr 7, 2016
  26. 21/24 check_aliased_update(): check that dst_name is non-NULLDavid Turner, Apr 7, 2016
  27. 22/24 show_head_ref(): check the result of resolve_ref_namespace()David Turner, Apr 7, 2016
  28. 23/24 refs: move resolve_ref_unsafe into common codeDavid Turner, Apr 7, 2016
  29. 24/24 refs: on symref reflog expire, lock symref not referrentDavid Turner, Apr 7, 2016
  30. Junio C HamanoApr 7, 2016
  31. Michael HaggertyApr 9, 2016
  32. Junio C HamanoApr 10, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.