summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-22 21:41:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-22 21:41:08 (GMT)
commitdb354b7f1be0d6d7b8cd85800f83a1d2d90cc4a5 (patch)
treef51571c8feeec599fd5e1312996cb66ea38a959a /builtin/apply.c
parentfda3e2cf017493ad9051c027a527e5c995ebfaf1 (diff)
downloadgit-db354b7f1be0d6d7b8cd85800f83a1d2d90cc4a5.zip
git-db354b7f1be0d6d7b8cd85800f83a1d2d90cc4a5.tar.gz
git-db354b7f1be0d6d7b8cd85800f83a1d2d90cc4a5.tar.bz2
apply: remove unused call to free() in gitdiff_{old,new}name()
These two functions keep a copy of filename it was given, let gitdiff_verify_name() to rewrite it to a new filename and then free the original if they receive a newly minted filename. However (1) when the original name is NULL, gitdiff_verify_name() returns either NULL or a newly minted value. Either case, we do not have to worry about calling free() on the original NULL. (2) when the original name is not NULL, gitdiff_verify_name() either returns that as-is, or calls die() when it finds inconsistency in the patch. When the function returns, we know that "if ()" statement always is false. Noticed by Christian Couder. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 465f954..4afc94f 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -953,21 +953,15 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
static int gitdiff_oldname(const char *line, struct patch *patch)
{
- char *orig = patch->old_name;
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;
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;
}