undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-09-15 13:56:07 -07:00
parent 83379df025
commit f50fee4a04
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin.h
View File

@ -21,7 +21,6 @@ struct fmt_merge_msg_opts {
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out, extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct fmt_merge_msg_opts *); struct fmt_merge_msg_opts *);
extern void commit_notes(struct notes_tree *t, const char *msg);
struct notes_rewrite_cfg { struct notes_rewrite_cfg {
struct notes_tree **trees; 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); struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c, int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj); const unsigned char *from_obj, const unsigned char *to_obj);

7
builtin/notes.c
View File

@ -19,6 +19,9 @@
#include "string-list.h" #include "string-list.h"
#include "notes-merge.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[] = { static const char * const git_notes_usage[] = {
N_("git notes [--ref <notes_ref>] [list [<object>]]"), N_("git notes [--ref <notes_ref>] [list [<object>]]"),
N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<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; struct strbuf buf = STRBUF_INIT;
unsigned char commit_sha1[20]; 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")) if (!strcasecmp(v, "overwrite"))
return combine_notes_overwrite; return combine_notes_overwrite;