apply: remove unused call to free() in gitdiff_{old,new}name()

gitster · gitster · commit db354b7f1be0 · 2016-03-22T14:41:08.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -953,21 +953,15 @@ static char gitdiff_verify_name(const char line, int isnull, char *orig_name,`
`953`	`953`
`954`	`954`	`static int gitdiff_oldname(const char line, struct patch patch)`
`955`	`955`	`{`
`956`		`- char *orig = patch->old_name;`
`957`	`956`	`patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,`
`958`	`957`	`DIFF_OLD_NAME);`
`959`		`- if (orig != patch->old_name)`
`960`		`- free(orig);`
`961`	`958`	`return 0;`
`962`	`959`	`}`
`963`	`960`
`964`	`961`	`static int gitdiff_newname(const char line, struct patch patch)`
`965`	`962`	`{`
`966`		`- char *orig = patch->new_name;`
`967`	`963`	`patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,`
`968`	`964`	`DIFF_NEW_NAME);`
`969`		`- if (orig != patch->new_name)`
`970`		`- free(orig);`
`971`	`965`	`return 0;`
`972`	`966`	`}`
`973`	`967`