summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-11 22:46:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-11 22:49:50 (GMT)
commit8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch)
tree1bb31c78644ac1eb034212b97f3730733286ebae /grep.c
parenta9645b780b698703cd7dee25051d6ce39b0544c6 (diff)
parent9db56f71b91153f4076a796c80c61f00edd8b700 (diff)
downloadgit-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.zip
git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.gz
git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.bz2
Merge branch 'maint'
* maint: Fix non-literal format in printf-style calls git-submodule: Avoid printing a spurious message. git ls-remote: make usage string match manpage Makefile: help people who run 'make check' by mistake
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/grep.c b/grep.c
index e2c190a..600f69f 100644
--- a/grep.c
+++ b/grep.c
@@ -514,7 +514,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
if (from <= last_shown)
from = last_shown + 1;
if (last_shown && from != last_shown + 1)
- printf(hunk_mark);
+ fputs(hunk_mark, stdout);
while (from < lno) {
pcl = &prev[lno-from-1];
show_line(opt, pcl->bol, pcl->eol,
@@ -524,7 +524,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
last_shown = lno-1;
}
if (last_shown && lno != last_shown + 1)
- printf(hunk_mark);
+ fputs(hunk_mark, stdout);
if (!opt->count)
show_line(opt, bol, eol, name, lno, ':');
last_shown = last_hit = lno;
@@ -535,7 +535,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
* we need to show this line.
*/
if (last_shown && lno != last_shown + 1)
- printf(hunk_mark);
+ fputs(hunk_mark, stdout);
show_line(opt, bol, eol, name, lno, '-');
last_shown = lno;
}