From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Subject: [PATCH 1/7] builtin/notes.c: mark file-scope functions as static
Date: Sat, 15 Sep 2012 14:10:46 -0700 [thread overview]
Message-ID: <1347743452-2487-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <5054AA62.2040603@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin.h | 2 --
builtin/notes.c | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin.h b/builtin.h
index 8e37752..95116b8 100644
--- 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
index 554c801..453457a 100644
--- 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;
--
1.7.12.508.g4d78187
next prev parent reply other threads:[~2012-09-15 21:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-15 16:18 [PATCH] test-string-list.c: Fix some sparse warnings Ramsay Jones
2012-09-15 20:52 ` Junio C Hamano
2012-09-15 21:10 ` Junio C Hamano [this message]
2012-09-15 21:10 ` [PATCH 2/7] commit.c: mark file-scope functions as static Junio C Hamano
2012-09-15 21:10 ` [PATCH 3/7] diff.c: mark private file-scope symbols " Junio C Hamano
2012-09-15 21:10 ` [PATCH 4/7] graph.c: " Junio C Hamano
2012-09-15 21:10 ` [PATCH 5/7] grep.c: " Junio C Hamano
2012-09-19 18:02 ` Ramsay Jones
2012-09-19 20:46 ` Junio C Hamano
2012-09-20 20:43 ` Ramsay Jones
2012-09-15 21:10 ` [PATCH 6/7] rerere.c: " Junio C Hamano
2012-09-15 21:10 ` [PATCH 7/7] notes.c: " Junio C Hamano
2012-09-17 8:15 ` [PATCH] test-string-list.c: Fix some sparse warnings Michael Haggerty
2012-09-19 19:07 ` Ramsay Jones
2012-09-20 7:13 ` Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347743452-2487-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).