Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 7d9be63..3f740c7 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1525,7 +1525,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
return -1;
}
-static void record_ws_error(unsigned result, const char *line, int len, int linenr)
+static void record_ws_error(unsigned result, const char *line, int len, int l_nr)
{
char *err;
@@ -1539,7 +1539,7 @@ static void record_ws_error(unsigned result, const char *line, int len, int line
err = whitespace_error_string(result);
fprintf(stderr, "%s:%d: %s.\n%.*s\n",
- patch_input_file, linenr, err, len, line);
+ patch_input_file, l_nr, err, len, line);
free(err);
}
--
2.8.0.rc1.49.gca61272
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html