From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: [PATCHv3 3/4] remote: drop free_refspecs() function
Date: Mon, 15 May 2017 13:05:56 +0200 [thread overview]
Message-ID: <20170515110557.11913-4-szeder.dev@gmail.com> (raw)
In-Reply-To: <20170515110557.11913-1-szeder.dev@gmail.com>
From: Jeff King <peff@peff.net>
We already have free_refspec(), a public function which does
the same thing as the static free_refspecs(). Let's just
keep one. There are two minor differences between the
functions:
1. free_refspecs() is a noop when the refspec argument is
NULL. This probably doesn't matter in practice. The
nr_refspec parameter would presumably be 0 in that
case, skipping the loop. And free(NULL) is explicitly
OK. But it doesn't hurt for us to port this extra
safety to free_refspec(), as one of the callers passes
a funny "i+1" count.
2. The order of arguments is reversed between the two
functions. This patch uses the already-public order of
free_refspec(), as it matches the argument order on the
parsing side.
Signed-off-by: Jeff King <peff@peff.net>
---
remote.c | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/remote.c b/remote.c
index ad6c5424e..7918e0dac 100644
--- a/remote.c
+++ b/remote.c
@@ -473,26 +473,6 @@ static void read_config(void)
alias_all_urls();
}
-/*
- * This function frees a refspec array.
- * Warning: code paths should be checked to ensure that the src
- * and dst pointers are always freeable pointers as well
- * as the refspec pointer itself.
- */
-static void free_refspecs(struct refspec *refspec, int nr_refspec)
-{
- int i;
-
- if (!refspec)
- return;
-
- for (i = 0; i < nr_refspec; i++) {
- free(refspec[i].src);
- free(refspec[i].dst);
- }
- free(refspec);
-}
-
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
{
int i;
@@ -606,7 +586,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
* since it is only possible to reach this point from within
* the for loop above.
*/
- free_refspecs(rs, i+1);
+ free_refspec(i+1, rs);
return NULL;
}
die("Invalid refspec '%s'", refspec[i]);
@@ -617,7 +597,7 @@ int valid_fetch_refspec(const char *fetch_refspec_str)
struct refspec *refspec;
refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
- free_refspecs(refspec, 1);
+ free_refspec(1, refspec);
return !!refspec;
}
@@ -634,6 +614,10 @@ static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
void free_refspec(int nr_refspec, struct refspec *refspec)
{
int i;
+
+ if (!refspec)
+ return;
+
for (i = 0; i < nr_refspec; i++) {
free(refspec[i].src);
free(refspec[i].dst);
--
2.13.0.35.g14b6294b1
next prev parent reply other threads:[~2017-05-15 11:06 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 11:05 [PATCHv3 0/4] clone: respect configured fetch respecs during initial fetch SZEDER Gábor
2017-05-15 11:05 ` [PATCHv3 1/4] clone: respect additional configured fetch refspecs " SZEDER Gábor
2017-05-15 23:07 ` Jeff King
2017-05-26 10:04 ` SZEDER Gábor
2017-05-26 13:30 ` Jeff King
2017-05-30 3:53 ` Junio C Hamano
2017-05-30 3:55 ` Jeff King
2017-05-30 7:11 ` SZEDER Gábor
2017-05-30 7:12 ` [PATCHv4 1/2] " SZEDER Gábor
2017-05-30 7:12 ` [PATCHv4 2/2] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-05-30 9:01 ` Ævar Arnfjörð Bjarmason
2017-05-31 8:50 ` SZEDER Gábor
2017-05-31 14:17 ` Ævar Arnfjörð Bjarmason
2017-06-13 23:24 ` Jonathan Nieder
2017-05-31 4:23 ` [PATCHv4 1/2] clone: respect additional configured fetch refspecs during initial fetch Jeff King
2017-05-31 9:34 ` SZEDER Gábor
2017-06-05 8:18 ` Jeff King
2017-06-06 18:19 ` SZEDER Gábor
2017-06-06 18:37 ` Jeff King
2017-06-07 11:17 ` SZEDER Gábor
2017-06-14 0:48 ` Jonathan Nieder
2017-06-14 9:50 ` Jeff King
2017-06-16 17:36 ` SZEDER Gábor
2017-06-16 17:38 ` [PATCHv5 0/2] " SZEDER Gábor
2017-06-16 17:38 ` [PATCHv5 1/2] " SZEDER Gábor
2017-06-16 20:37 ` Jonathan Nieder
2017-06-17 11:22 ` Jeff King
2017-06-22 22:23 ` Junio C Hamano
2017-08-12 0:48 ` Junio C Hamano
2017-06-16 17:38 ` [PATCHv5 2/2] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-06-16 18:23 ` Ævar Arnfjörð Bjarmason
2017-06-16 20:41 ` Jonathan Nieder
2017-06-16 21:10 ` Ævar Arnfjörð Bjarmason
2017-06-16 22:15 ` SZEDER Gábor
2017-06-16 20:38 ` Jonathan Nieder
2017-06-16 22:09 ` Junio C Hamano
2017-05-31 4:27 ` [PATCH] remote: drop free_refspecs() function Jeff King
2017-06-14 0:49 ` Jonathan Nieder
2017-05-15 11:05 ` [PATCHv3 2/4] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-05-26 14:01 ` SZEDER Gábor
2017-05-15 11:05 ` SZEDER Gábor [this message]
2017-05-15 11:05 ` [PATCHv3 4/4] clone: use free_refspec() to free refspec list SZEDER Gábor
2017-05-15 11:29 ` SZEDER Gábor
2017-05-15 23:10 ` Jeff King
2017-05-23 7:38 ` Junio C Hamano
2017-05-23 11:27 ` Jeff King
2017-05-23 12:06 ` SZEDER Gábor
2017-05-15 22:46 ` [PATCHv3 0/4] clone: respect configured fetch respecs during initial fetch Jeff King
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=20170515110557.11913-4-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.