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

gitster · gitster · commit 36d1f3d1313a · 2012-09-21T11:14:49.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1469,7 +1469,7 @@ static int grep_source_load_file(struct grep_source *gs)`
`1469`	`1469`	`return 0;`
`1470`	`1470`	`}`
`1471`	`1471`
`1472`		`-int grep_source_load(struct grep_source *gs)`
	`1472`	`+static int grep_source_load(struct grep_source *gs)`
`1473`	`1473`	`{`
`1474`	`1474`	`if (gs->buf)`
`1475`	`1475`	`return 0;`
`@@ -1497,7 +1497,7 @@ void grep_source_load_driver(struct grep_source *gs)`
`1497`	`1497`	`grep_attr_unlock();`
`1498`	`1498`	`}`
`1499`	`1499`
`1500`		`-int grep_source_is_binary(struct grep_source *gs)`
	`1500`	`+static int grep_source_is_binary(struct grep_source *gs)`
`1501`	`1501`	`{`
`1502`	`1502`	`grep_source_load_driver(gs);`
`1503`	`1503`	`if (gs->driver->binary != -1)`