builtin/notes.c: mark file-scope private symbols as static

gitster · gitster · commit f50fee4a0476 · 2012-09-15T22:58:20.000-07:00
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin.h b/builtin.h
@@ -21,7 +21,6 @@ struct fmt_merge_msg_opts {
 
 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 			 struct fmt_merge_msg_opts *);
-extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {
 	struct notes_tree **trees;
@@ -33,7 +32,6 @@ struct notes_rewrite_cfg {
 	int mode_from_env;
 };
 
-combine_notes_fn parse_combine_notes_fn(const char *v);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
 			  const unsigned char *from_obj, const unsigned char *to_obj);
diff --git a/builtin/notes.c b/builtin/notes.c
@@ -19,6 +19,9 @@
 #include "string-list.h"
 #include "notes-merge.h"
 
+static void commit_notes(struct notes_tree *t, const char *msg);
+static combine_notes_fn parse_combine_notes_fn(const char *v);
+
 static const char * const git_notes_usage[] = {
 	N_("git notes [--ref <notes_ref>] [list [<object>]]"),
 	N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
@@ -288,7 +291,7 @@ static int parse_reedit_arg(const struct option *opt, const char *arg, int unset
 	return parse_reuse_arg(opt, arg, unset);
 }
 
-void commit_notes(struct notes_tree *t, const char *msg)
+static void commit_notes(struct notes_tree *t, const char *msg)
 {
 	struct strbuf buf = STRBUF_INIT;
 	unsigned char commit_sha1[20];
@@ -312,7 +315,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
 	strbuf_release(&buf);
 }
 
-combine_notes_fn parse_combine_notes_fn(const char *v)
+static combine_notes_fn parse_combine_notes_fn(const char *v)
 {
 	if (!strcasecmp(v, "overwrite"))
 		return combine_notes_overwrite;

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`#include "string-list.h"`
`20`	`20`	`#include "notes-merge.h"`
`21`	`21`
	`22`	`+static void commit_notes(struct notes_tree t, const char msg);`
	`23`	`+static combine_notes_fn parse_combine_notes_fn(const char *v);`
	`24`	`+`
`22`	`25`	`static const char * const git_notes_usage[] = {`
`23`	`26`	`N_("git notes [--ref <notes_ref>] [list [<object>]]"),`
`24`	`27`	`N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> \| -F <file> \| (-c \| -C) <object>] [<object>]"),`
`@@ -288,7 +291,7 @@ static int parse_reedit_arg(const struct option opt, const char arg, int unset`
`288`	`291`	`return parse_reuse_arg(opt, arg, unset);`
`289`	`292`	`}`
`290`	`293`
`291`		`-void commit_notes(struct notes_tree t, const char msg)`
	`294`	`+static void commit_notes(struct notes_tree t, const char msg)`
`292`	`295`	`{`
`293`	`296`	`struct strbuf buf = STRBUF_INIT;`
`294`	`297`	`unsigned char commit_sha1[20];`
`@@ -312,7 +315,7 @@ void commit_notes(struct notes_tree t, const char msg)`
`312`	`315`	`strbuf_release(&buf);`
`313`	`316`	`}`
`314`	`317`
`315`		`-combine_notes_fn parse_combine_notes_fn(const char *v)`
	`318`	`+static combine_notes_fn parse_combine_notes_fn(const char *v)`
`316`	`319`	`{`
`317`	`320`	`if (!strcasecmp(v, "overwrite"))`
`318`	`321`	`return combine_notes_overwrite;`