From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH 1/3] fetch.c: clear errno before calling functions that might set it
Date: Tue, 22 Apr 2014 11:45:25 -0700 [thread overview]
Message-ID: <1398192327-21302-2-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398192327-21302-1-git-send-email-sahlberg@google.com>
In s_update_ref there are two calls that when they fail we return an error
based on the errno value. In particular we want to return a specific error
if ENOTDIR happened. Both these functions do have failure modes where they
may return an error without updating errno, in which case a previous and
unrelated ENOTDIT may cause us to return the wrong error. Clear errno before
calling any functions if we check errno afterwards.
Also skip initializing a static variable to 0. Sstatics live in .bss and
are all automatically initialized to 0.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
builtin/fetch.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 55f457c..a93c893 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -44,7 +44,7 @@ static struct transport *gtransport;
static struct transport *gsecondary;
static const char *submodule_prefix = "";
static const char *recurse_submodules_default;
-static int shown_url = 0;
+static int shown_url;
static int option_parse_recurse_submodules(const struct option *opt,
const char *arg, int unset)
@@ -382,6 +382,8 @@ static int s_update_ref(const char *action,
if (!rla)
rla = default_rla.buf;
snprintf(msg, sizeof(msg), "%s: %s", rla, action);
+
+ errno = 0;
lock = lock_any_ref_for_update(ref->name,
check_old ? ref->old_sha1 : NULL,
0, NULL);
--
1.9.1.518.g16976cb.dirty
next prev parent reply other threads:[~2014-04-22 18:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 18:45 [PATCH 0/3] Use ref transactions for fetch Ronnie Sahlberg
2014-04-22 18:45 ` Ronnie Sahlberg [this message]
2014-04-23 20:12 ` [PATCH 1/3] fetch.c: clear errno before calling functions that might set it Eric Sunshine
2014-04-24 15:21 ` Ronnie Sahlberg
2014-04-22 18:45 ` [PATCH 2/3] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-04-23 20:12 ` Eric Sunshine
2014-04-24 15:22 ` Ronnie Sahlberg
2014-04-22 18:45 ` [PATCH 3/3] fetch.c: use a single ref transaction for all ref updates Ronnie Sahlberg
2014-04-23 20:17 ` Eric Sunshine
2014-04-24 15:23 ` Ronnie Sahlberg
2014-05-05 11:22 ` [PATCH 0/3] Use ref transactions for fetch Michael Haggerty
2014-05-05 15:08 ` Ronnie Sahlberg
2014-05-06 18:40 ` Junio C Hamano
2014-05-06 20:53 ` Michael Haggerty
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=1398192327-21302-2-git-send-email-sahlberg@google.com \
--to=sahlberg@google.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).