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

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index 8e377522fee4be94f9cdca40d44ecdcc18b42d8b..95116b85358637d3457288c7d28526cb1fa93630 100644 (file)
--- 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 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;
 
 struct notes_rewrite_cfg {
        struct notes_tree **trees;


@@ -33,7 +32,6 @@ struct notes_rewrite_cfg {
        int mode_from_env;
 };
 
        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);
 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
index 554c80167c31d4d42aefe2f02feacffef9424844..453457adb9dedac510c5a95e0e07cb0b4b46c80e 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -19,6 +19,9 @@
 #include "string-list.h"
 #include "notes-merge.h"
 
 #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>]"),
 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);
 }
 
        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];
 {
        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);
 }
 
        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;
 {
        if (!strcasecmp(v, "overwrite"))
                return combine_notes_overwrite;