Merge branch 'jc/grep' into next

* jc/grep: builtin-grep: printf %.*s length is int, not ptrdiff_t.
19 years ago · 5d028406e5
1 changed files with 1 additions and 1 deletions
--- a/builtin-grep.c
+++ b/builtin-grep.c
@ -103,7 +103,7 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
				@@ -103,7 +103,7 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
 	printf("%s%c", name, sign);
 	if (opt->linenum)
 		printf("%d%c", lno, sign);
-	printf("%.*s\n", eol-bol, bol);
+	printf("%.*s\n", (int)(eol-bol), bol);
 }

 static int grep_buffer(struct grep_opt *opt, const char *name,