Merge branch 'rs/apply-name-terminate'

Code clean-up.

* rs/apply-name-terminate:
  apply: remove unused parameters from name_terminate()
This commit is contained in:
Junio C Hamano
2016-06-03 14:38:04 -07:00

View File

@ -442,7 +442,7 @@ static int is_dev_null(const char *str)
#define TERM_SPACE 1 #define TERM_SPACE 1
#define TERM_TAB 2 #define TERM_TAB 2
static int name_terminate(const char *name, int namelen, int c, int terminate) static int name_terminate(int c, int terminate)
{ {
if (c == ' ' && !(terminate & TERM_SPACE)) if (c == ' ' && !(terminate & TERM_SPACE))
return 0; return 0;
@ -671,7 +671,7 @@ static char *find_name_common(const char *line, const char *def,
if (!end && isspace(c)) { if (!end && isspace(c)) {
if (c == '\n') if (c == '\n')
break; break;
if (name_terminate(start, line-start, c, terminate)) if (name_terminate(c, terminate))
break; break;
} }
line++; line++;