From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Jun 2016 21:38:04 +0000 (-0700)
Subject: Merge branch 'rs/apply-name-terminate'
X-Git-Tag: v2.9.0-rc2~5
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/bf523da2a2ed830686b72cd1fd51c51c808c6587?hp=29e54b019f55f48af3f0d4c62eede86058c16b52

Merge branch 'rs/apply-name-terminate'

Code clean-up.

* rs/apply-name-terminate:
apply: remove unused parameters from name_terminate()
---

diff --git a/builtin/apply.c b/builtin/apply.c
index 8e4da2e1bd..c770d7d3d9 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++;