Merge branch 'jc/maint-log-grep-all-match-1' into next

* jc/maint-log-grep-all-match-1:
  grep.c: make two symbols really file-scope static this time
This commit is contained in:
Junio C Hamano
2012-09-20 20:51:27 -07:00

4
grep.c
View File

@@ -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)