From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Subject: [PATCH 10/24] resolve_ref_unsafe(): ensure flags is always set
Date: Thu, 7 Apr 2016 15:02:57 -0400 [thread overview]
Message-ID: <1460055791-23313-11-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>
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
next prev 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 ` [PATCH 09/24] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH David Turner
2016-04-07 19:02 ` David Turner [this message]
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-11-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).