apply: drop unused "def" parameter from find_name_gnu()
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
667f71c36c
commit
74f8a9c954
5
apply.c
5
apply.c
@ -467,7 +467,6 @@ static char *squash_slash(char *name)
|
|||||||
|
|
||||||
static char *find_name_gnu(struct apply_state *state,
|
static char *find_name_gnu(struct apply_state *state,
|
||||||
const char *line,
|
const char *line,
|
||||||
const char *def,
|
|
||||||
int p_value)
|
int p_value)
|
||||||
{
|
{
|
||||||
struct strbuf name = STRBUF_INIT;
|
struct strbuf name = STRBUF_INIT;
|
||||||
@ -714,7 +713,7 @@ static char *find_name(struct apply_state *state,
|
|||||||
int terminate)
|
int terminate)
|
||||||
{
|
{
|
||||||
if (*line == '"') {
|
if (*line == '"') {
|
||||||
char *name = find_name_gnu(state, line, def, p_value);
|
char *name = find_name_gnu(state, line, p_value);
|
||||||
if (name)
|
if (name)
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
@ -731,7 +730,7 @@ static char *find_name_traditional(struct apply_state *state,
|
|||||||
size_t date_len;
|
size_t date_len;
|
||||||
|
|
||||||
if (*line == '"') {
|
if (*line == '"') {
|
||||||
char *name = find_name_gnu(state, line, def, p_value);
|
char *name = find_name_gnu(state, line, p_value);
|
||||||
if (name)
|
if (name)
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user