summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-03 21:38:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-03 21:38:04 (GMT)
commitbf523da2a2ed830686b72cd1fd51c51c808c6587 (patch)
tree1ffa7e642b140a0c6607b958509744fd39440436 /builtin/apply.c
parent29e54b019f55f48af3f0d4c62eede86058c16b52 (diff)
parentaa20cbc2e6cc39853dad688fcd7dc51132172fcd (diff)
downloadgit-bf523da2a2ed830686b72cd1fd51c51c808c6587.zip
git-bf523da2a2ed830686b72cd1fd51c51c808c6587.tar.gz
git-bf523da2a2ed830686b72cd1fd51c51c808c6587.tar.bz2
Merge branch 'rs/apply-name-terminate'
Code clean-up. * rs/apply-name-terminate: apply: remove unused parameters from name_terminate()
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 8e4da2e..c770d7d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -442,7 +442,7 @@ static int is_dev_null(const char *str)
#define TERM_SPACE 1
#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))
return 0;
@@ -671,7 +671,7 @@ static char *find_name_common(const char *line, const char *def,
if (!end && isspace(c)) {
if (c == '\n')
break;
- if (name_terminate(start, line-start, c, terminate))
+ if (name_terminate(c, terminate))
break;
}
line++;