Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/apply-name-terminate'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Jun 2016 21:38:04 +0000
(14:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Jun 2016 21:38:04 +0000
(14:38 -0700)
Code clean-up.
* rs/apply-name-terminate:
apply: remove unused parameters from name_terminate()
builtin/apply.c
patch
|
blob
|
history
raw
(from parent 1:
29e54b0
)
diff --git
a/builtin/apply.c
b/builtin/apply.c
index 8e4da2e1bdaf02590289f54750a9602281f4a365..c770d7d3d9fd923957478667291a77d33935ebe5 100644
(file)
--- 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++;