builtin/notes.c: mark file-scope private symbols as static
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 15, 2012 at 13:56 UTC
f50fee4a0476dfd1315612f49244e7050280bf68
2 files changed
+5
-4
builtin.h
-2
@@ -21,7 +21,6 @@ struct fmt_merge_msg_opts {
21
22
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
23
struct fmt_merge_msg_opts *);
24
-extern void commit_notes(struct notes_tree *t, const char *msg);
24
25
struct notes_rewrite_cfg {
26
struct notes_tree **trees;
@@ -33,7 +32,6 @@ struct notes_rewrite_cfg {
32
int mode_from_env;
33
};
34
36
-combine_notes_fn parse_combine_notes_fn(const char *v);
35
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
36
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
37
const unsigned char *from_obj, const unsigned char *to_obj);
builtin/notes.c
+5
-2
@@ -19,6 +19,9 @@
19
#include "string-list.h"
20
#include "notes-merge.h"
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
+
25
static const char * const git_notes_usage[] = {
26
N_("git notes [--ref <notes_ref>] [list [<object>]]"),
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
291
return parse_reuse_arg(opt, arg, unset);
292
}
293
291
-void commit_notes(struct notes_tree *t, const char *msg)
294
+static void commit_notes(struct notes_tree *t, const char *msg)
295
{
296
struct strbuf buf = STRBUF_INIT;
297
unsigned char commit_sha1[20];
@@ -312,7 +315,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
315
strbuf_release(&buf);
316
}
317
315
-combine_notes_fn parse_combine_notes_fn(const char *v)
318
+static combine_notes_fn parse_combine_notes_fn(const char *v)
319
{
320
if (!strcasecmp(v, "overwrite"))
321
return combine_notes_overwrite;