Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 builtin/apply.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index e133b38..7115dc2 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1516,7 +1516,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;
 
@@ -1530,7 +1530,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.1.300.g5fed0c0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to