From: Jeff King <peff@peff.net>
To: Stefan Beller <sbeller@google.com>
Cc: sahlberg@google.com, jrnieder@gmail.com, gitster@pobox.com,
git@vger.kernel.org
Subject: [PATCH 2/4] lock_ref_sha1_basic: simplify errno handling
Date: Tue, 18 Nov 2014 20:37:30 -0500 [thread overview]
Message-ID: <20141119013730.GB2135@peff.net> (raw)
In-Reply-To: <20141119013532.GA861@peff.net>
Now that error() does not clobber errno, we do not have to
take pains to save it ourselves.
Signed-off-by: Jeff King <peff@peff.net>
---
refs.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index 5ff457e..169a46d 100644
--- a/refs.c
+++ b/refs.c
@@ -2232,7 +2232,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
char *ref_file;
const char *orig_refname = refname;
struct ref_lock *lock;
- int last_errno = 0;
int type, lflags;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
int resolve_flags = 0;
@@ -2260,7 +2259,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
*/
ref_file = git_path("%s", orig_refname);
if (remove_empty_directories(ref_file)) {
- last_errno = errno;
error("there are still refs under '%s'", orig_refname);
goto error_return;
}
@@ -2270,7 +2268,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
if (type_p)
*type_p = type;
if (!refname) {
- last_errno = errno;
error("unable to resolve reference %s: %s",
orig_refname, strerror(errno));
goto error_return;
@@ -2283,7 +2280,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
*/
if (missing &&
!is_refname_available(refname, skip, get_packed_refs(&ref_cache))) {
- last_errno = ENOTDIR;
+ errno = ENOTDIR;
goto error_return;
}
@@ -2311,7 +2308,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
goto retry;
/* fall through */
default:
- last_errno = errno;
error("unable to create directory for %s", ref_file);
goto error_return;
}
@@ -2332,7 +2328,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
error_return:
unlock_ref(lock);
- errno = last_errno;
return NULL;
}
--
2.1.2.596.g7379948
next prev parent reply other threads:[~2014-11-19 1:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 23:17 [PATCH] refs.c: handle locking failure during transaction better Stefan Beller
2014-11-18 23:34 ` Stefan Beller
2014-11-19 1:13 ` Stefan Beller
2014-11-19 1:35 ` [PATCH 0/4] error cleanups in lock_ref_sha1_basic Jeff King
2014-11-19 1:37 ` [PATCH 1/4] error: save and restore errno Jeff King
2014-11-19 1:41 ` Stefan Beller
2014-11-19 1:43 ` Jonathan Nieder
2014-11-19 1:47 ` Jeff King
2014-11-19 18:14 ` Junio C Hamano
2014-11-19 18:28 ` Jeff King
2014-11-19 1:37 ` Jeff King [this message]
2014-11-19 1:54 ` [PATCH 2/4] lock_ref_sha1_basic: simplify errno handling Jonathan Nieder
2014-11-21 9:25 ` Michael Haggerty
2014-11-19 1:37 ` [PATCH 3/4] lock_ref_sha1_basic: simplify error code path Jeff King
2014-11-19 2:00 ` Jonathan Nieder
2014-11-19 2:04 ` Jeff King
2014-11-19 2:07 ` Jonathan Nieder
2014-11-19 21:41 ` Junio C Hamano
2014-11-19 22:28 ` Jeff King
2014-11-19 22:34 ` Junio C Hamano
2014-11-19 22:36 ` Jeff King
2014-11-20 1:07 ` Jonathan Nieder
2014-11-19 1:41 ` [PATCH 4/4] lock_ref_sha1_basic: do not die on locking errors Jeff King
2014-11-19 2:05 ` Jonathan Nieder
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=20141119013730.GB2135@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sahlberg@google.com \
--cc=sbeller@google.com \
/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).