aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-21 11:14:49 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-21 11:14:49 -0700
commit36d1f3d1313af490a4c7dc963f34a2c9a92556d6 (patch)
treef6afec4ca8bb9e771fd1d7b24a4926419e104717
parentf1c62ee9de2239537167d8791bd5e62403191f66 (diff)
parent3083301ead459a45059af3ee85fb51d5d737a74d (diff)
downloadgit-36d1f3d1313af490a4c7dc963f34a2c9a92556d6.tar.gz
git-36d1f3d1313af490a4c7dc963f34a2c9a92556d6.tar.xz
Merge branch 'jc/maint-log-grep-all-match-1'
A finishing touch to make two symbols that were meant to be file-scope static really so. * jc/maint-log-grep-all-match-1: grep.c: make two symbols really file-scope static this time
-rw-r--r--grep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index c7f8a4750..898be6ebf 100644
--- a/grep.c
+++ b/grep.c
@@ -1469,7 +1469,7 @@ static int grep_source_load_file(struct grep_source *gs)
return 0;
}
-int grep_source_load(struct grep_source *gs)
+static int grep_source_load(struct grep_source *gs)
{
if (gs->buf)
return 0;
@@ -1497,7 +1497,7 @@ void grep_source_load_driver(struct grep_source *gs)
grep_attr_unlock();
}
-int grep_source_is_binary(struct grep_source *gs)
+static int grep_source_is_binary(struct grep_source *gs)
{
grep_source_load_driver(gs);
if (gs->driver->binary != -1)