From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 3/3] builtin/apply: simplify gitdiff_{old,new}name()
Date: Tue, 22 Mar 2016 21:58:42 +0100 [thread overview]
Message-ID: <1458680322-17681-4-git-send-email-chriscool@tuxfamily.org> (raw)
In-Reply-To: <1458680322-17681-1-git-send-email-chriscool@tuxfamily.org>
After the previous simplifications, it is easy to see that
there is no need to free the original string passed to
gitdiff_verify_name(), because this string can be changed
only when it is NULL.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/apply.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 4cafdaf..9cfa9f4 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -953,21 +953,15 @@ static void gitdiff_verify_name(const char *line, int isnull, char **name, int s
static int gitdiff_oldname(const char *line, struct patch *patch)
{
- char *orig = patch->old_name;
gitdiff_verify_name(line, patch->is_new, &patch->old_name,
DIFF_OLD_NAME);
- if (orig != patch->old_name)
- free(orig);
return 0;
}
static int gitdiff_newname(const char *line, struct patch *patch)
{
- char *orig = patch->new_name;
gitdiff_verify_name(line, patch->is_delete, &patch->new_name,
DIFF_NEW_NAME);
- if (orig != patch->new_name)
- free(orig);
return 0;
}
--
2.8.0.rc4.1.g302de0d.dirty
next prev parent reply other threads:[~2016-03-22 21:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 20:58 [PATCH 0/3] builtin/apply: simplify some gitdiff_* functions Christian Couder
2016-03-22 20:58 ` [PATCH 1/3] builtin/apply: get rid of useless 'name' variable Christian Couder
2016-03-22 21:20 ` Junio C Hamano
2016-03-22 20:58 ` [PATCH 2/3] builtin/apply: make gitdiff_verify_name() return void Christian Couder
2016-03-22 21:25 ` Junio C Hamano
2016-03-22 22:10 ` Christian Couder
2016-03-22 20:58 ` Christian Couder [this message]
2016-03-22 21:35 ` [PATCH 3/3] builtin/apply: simplify gitdiff_{old,new}name() 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=1458680322-17681-4-git-send-email-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).