grep: make callback functions static

René Scharfe · gitster · commit ff3c7f9a264d · 2009-05-20T18:16:25.000-07:00
Suggested by Stephen Boyd: make the callback functions used for option
parsing static.

Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-grep.c b/builtin-grep.c
@@ -565,7 +565,8 @@ static int grep_object(struct grep_opt *opt, const char **paths,
 	die("unable to grep from object of type %s", typename(obj->type));
 }
 
-int context_callback(const struct option *opt, const char *arg, int unset)
+static int context_callback(const struct option *opt, const char *arg,
+			    int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	int value;
@@ -584,7 +585,7 @@ int context_callback(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-int file_callback(const struct option *opt, const char *arg, int unset)
+static int file_callback(const struct option *opt, const char *arg, int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	FILE *patterns;
@@ -606,42 +607,43 @@ int file_callback(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-int not_callback(const struct option *opt, const char *arg, int unset)
+static int not_callback(const struct option *opt, const char *arg, int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	append_grep_pattern(grep_opt, "--not", "command line", 0, GREP_NOT);
 	return 0;
 }
 
-int and_callback(const struct option *opt, const char *arg, int unset)
+static int and_callback(const struct option *opt, const char *arg, int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	append_grep_pattern(grep_opt, "--and", "command line", 0, GREP_AND);
 	return 0;
 }
 
-int open_callback(const struct option *opt, const char *arg, int unset)
+static int open_callback(const struct option *opt, const char *arg, int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	append_grep_pattern(grep_opt, "(", "command line", 0, GREP_OPEN_PAREN);
 	return 0;
 }
 
-int close_callback(const struct option *opt, const char *arg, int unset)
+static int close_callback(const struct option *opt, const char *arg, int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	append_grep_pattern(grep_opt, ")", "command line", 0, GREP_CLOSE_PAREN);
 	return 0;
 }
 
-int pattern_callback(const struct option *opt, const char *arg, int unset)
+static int pattern_callback(const struct option *opt, const char *arg,
+			    int unset)
 {
 	struct grep_opt *grep_opt = opt->value;
 	append_grep_pattern(grep_opt, arg, "-e option", 0, GREP_PATTERN);
 	return 0;
 }
 
-int help_callback(const struct option *opt, const char *arg, int unset)
+static int help_callback(const struct option *opt, const char *arg, int unset)
 {
 	return -1;
 }

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,8 @@ static int grep_object(struct grep_opt opt, const char *paths,`
`565`	`565`	`die("unable to grep from object of type %s", typename(obj->type));`
`566`	`566`	`}`
`567`	`567`
`568`		`-int context_callback(const struct option opt, const char arg, int unset)`
	`568`	`+static int context_callback(const struct option opt, const char arg,`
	`569`	`+ int unset)`
`569`	`570`	`{`
`570`	`571`	`struct grep_opt *grep_opt = opt->value;`
`571`	`572`	`int value;`
`@@ -584,7 +585,7 @@ int context_callback(const struct option opt, const char arg, int unset)`
`584`	`585`	`return 0;`
`585`	`586`	`}`
`586`	`587`
`587`		`-int file_callback(const struct option opt, const char arg, int unset)`
	`588`	`+static int file_callback(const struct option opt, const char arg, int unset)`
`588`	`589`	`{`
`589`	`590`	`struct grep_opt *grep_opt = opt->value;`
`590`	`591`	`FILE *patterns;`
`@@ -606,42 +607,43 @@ int file_callback(const struct option opt, const char arg, int unset)`
`606`	`607`	`return 0;`
`607`	`608`	`}`
`608`	`609`
`609`		`-int not_callback(const struct option opt, const char arg, int unset)`
	`610`	`+static int not_callback(const struct option opt, const char arg, int unset)`
`610`	`611`	`{`
`611`	`612`	`struct grep_opt *grep_opt = opt->value;`
`612`	`613`	`append_grep_pattern(grep_opt, "--not", "command line", 0, GREP_NOT);`
`613`	`614`	`return 0;`
`614`	`615`	`}`
`615`	`616`
`616`		`-int and_callback(const struct option opt, const char arg, int unset)`
	`617`	`+static int and_callback(const struct option opt, const char arg, int unset)`
`617`	`618`	`{`
`618`	`619`	`struct grep_opt *grep_opt = opt->value;`
`619`	`620`	`append_grep_pattern(grep_opt, "--and", "command line", 0, GREP_AND);`
`620`	`621`	`return 0;`
`621`	`622`	`}`
`622`	`623`
`623`		`-int open_callback(const struct option opt, const char arg, int unset)`
	`624`	`+static int open_callback(const struct option opt, const char arg, int unset)`
`624`	`625`	`{`
`625`	`626`	`struct grep_opt *grep_opt = opt->value;`
`626`	`627`	`append_grep_pattern(grep_opt, "(", "command line", 0, GREP_OPEN_PAREN);`
`627`	`628`	`return 0;`
`628`	`629`	`}`
`629`	`630`
`630`		`-int close_callback(const struct option opt, const char arg, int unset)`
	`631`	`+static int close_callback(const struct option opt, const char arg, int unset)`
`631`	`632`	`{`
`632`	`633`	`struct grep_opt *grep_opt = opt->value;`
`633`	`634`	`append_grep_pattern(grep_opt, ")", "command line", 0, GREP_CLOSE_PAREN);`
`634`	`635`	`return 0;`
`635`	`636`	`}`
`636`	`637`
`637`		`-int pattern_callback(const struct option opt, const char arg, int unset)`
	`638`	`+static int pattern_callback(const struct option opt, const char arg,`
	`639`	`+ int unset)`
`638`	`640`	`{`
`639`	`641`	`struct grep_opt *grep_opt = opt->value;`
`640`	`642`	`append_grep_pattern(grep_opt, arg, "-e option", 0, GREP_PATTERN);`
`641`	`643`	`return 0;`
`642`	`644`	`}`
`643`	`645`
`644`		`-int help_callback(const struct option opt, const char arg, int unset)`
	`646`	`+static int help_callback(const struct option opt, const char arg, int unset)`
`645`	`647`	`{`
`646`	`648`	`return -1;`
`647`	`649`	`}`