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>
Junio C Hamano committed
Mar 22, 2016 at 14:41 UTC
db354b7f1be0d6d7b8cd85800f83a1d2d90cc4a5
1 file changed
-6
builtin/apply.c
-6
@@ -953,21 +953,15 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
953
954
static int gitdiff_oldname(const char *line, struct patch *patch)
955
{
956
- char *orig = patch->old_name;
956
patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
957
DIFF_OLD_NAME);
959
- if (orig != patch->old_name)
960
- free(orig);
958
return 0;
959
}
960
961
static int gitdiff_newname(const char *line, struct patch *patch)
962
{
966
- char *orig = patch->new_name;
963
patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
964
DIFF_NEW_NAME);
969
- if (orig != patch->new_name)
970
- free(orig);
965
return 0;
966
}
967