apply: drop unused "def" parameter from find_name_gnu()

peff · gitster · commit 74f8a9c9543a · 2019-01-24T12:35:44.000-08:00
We use the "def" parameter in find_name_common() for some heuristics,
but they are not necessary with the less-ambiguous GNU format. Let's
drop this unused parameter.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/apply.c b/apply.c
@@ -467,7 +467,6 @@ static char *squash_slash(char *name)
 
 static char *find_name_gnu(struct apply_state *state,
 			   const char *line,
-			   const char *def,
 			   int p_value)
 {
 	struct strbuf name = STRBUF_INIT;
@@ -714,7 +713,7 @@ static char *find_name(struct apply_state *state,
 		       int terminate)
 {
 	if (*line == '"') {
-		char *name = find_name_gnu(state, line, def, p_value);
+		char *name = find_name_gnu(state, line, p_value);
 		if (name)
 			return name;
 	}
@@ -731,7 +730,7 @@ static char *find_name_traditional(struct apply_state *state,
 	size_t date_len;
 
 	if (*line == '"') {
-		char *name = find_name_gnu(state, line, def, p_value);
+		char *name = find_name_gnu(state, line, p_value);
 		if (name)
 			return name;
 	}

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,6 @@ static char squash_slash(char name)`
`467`	`467`
`468`	`468`	`static char find_name_gnu(struct apply_state state,`
`469`	`469`	`const char *line,`
`470`		`- const char *def,`
`471`	`470`	`int p_value)`
`472`	`471`	`{`
`473`	`472`	`struct strbuf name = STRBUF_INIT;`
`@@ -714,7 +713,7 @@ static char find_name(struct apply_state state,`
`714`	`713`	`int terminate)`
`715`	`714`	`{`
`716`	`715`	`if (*line == '"') {`
`717`		`- char *name = find_name_gnu(state, line, def, p_value);`
	`716`	`+ char *name = find_name_gnu(state, line, p_value);`
`718`	`717`	`if (name)`
`719`	`718`	`return name;`
`720`	`719`	`}`
`@@ -731,7 +730,7 @@ static char find_name_traditional(struct apply_state state,`
`731`	`730`	`size_t date_len;`
`732`	`731`
`733`	`732`	`if (*line == '"') {`
`734`		`- char *name = find_name_gnu(state, line, def, p_value);`
	`733`	`+ char *name = find_name_gnu(state, line, p_value);`
`735`	`734`	`if (name)`
`736`	`735`	`return name;`
`737`	`736`	`}`