From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git mailing list <git@vger.kernel.org>
Subject: [PATCH] remote: drop free_refspecs() function
Date: Wed, 31 May 2017 00:27:47 -0400 [thread overview]
Message-ID: <20170531042747.7k2yfd7eml6ep5cd@sigill.intra.peff.net> (raw)
In-Reply-To: <CAM0VKjnOSxQg_VCBO2cgtbqesmNYx+e_H7m=36PsNWi9K9rQ1Q@mail.gmail.com>
On Tue, May 30, 2017 at 09:11:28AM +0200, SZEDER Gábor wrote:
> I also dropped Peff's two patches that were included in v3, because:
>
> - his last patch doesn't apply anymore, because the variable it frees
> properly doesn't exist anymore, and
> - with that patch gone his second patch is not tangled up with this
> topic, so I think it should go on its own branch.
Makes sense on both counts. Here's that stand-alone patch for reference,
which can go onto its own topic.
-- >8 --
Subject: [PATCH] remote: drop free_refspecs() function
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 fdc52d802..2e39bf930 100644
--- a/remote.c
+++ b/remote.c
@@ -477,26 +477,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;
@@ -610,7 +590,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]);
@@ -621,7 +601,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;
}
@@ -638,6 +618,10 @@ 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.676.ge5a8f17ed
next prev parent reply other threads:[~2017-05-31 4:27 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 ` Jeff King [this message]
2017-06-14 0:49 ` [PATCH] remote: drop free_refspecs() function 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 ` [PATCHv3 3/4] remote: drop free_refspecs() function SZEDER Gábor
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170531042747.7k2yfd7eml6ep5cd@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).