[RFC][PATCH 04/10] Sparse: fix some "symbol not declared" warnings (Part 2)
From: Ramsay Jones <hidden>
Date: 2016-06-15 22:43:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
The complete warning message reads something like:
symbol 'whatever' was not declared. Should be static?
In this commit, the answer is yes; all of these symbols have
no need to be visible beyond the compilation unit, so make
them static.
Signed-off-by: Ramsay Jones <redacted>
---
builtin-branch.c | 4 ++--
builtin-revert.c | 6 +++---
commit.c | 2 +-
daemon.c | 2 +-
refs.c | 2 +-
upload-pack.c | 2 +-
wt-status.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 7408285..b2104fe 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c@@ -55,7 +55,7 @@ static int parse_branch_color_slot(const char *var, int ofs) die("bad config variable '%s'", var); } -int git_branch_config(const char *var, const char *value) +static int git_branch_config(const char *var, const char *value) { if (!strcmp(var, "color.branch")) { branch_use_color = git_config_colorbool(var, value);
@@ -72,7 +72,7 @@ int git_branch_config(const char *var, const char *value) return git_default_config(var, value); } -const char *branch_get_color(enum color_branch ix) +static const char *branch_get_color(enum color_branch ix) { if (branch_use_color) return branch_colors[ix];
diff --git a/builtin-revert.c b/builtin-revert.c
index ea2f15b..f58d32e 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c@@ -25,7 +25,7 @@ static const char *cherry_pick_usage = "git-cherry-pick [--edit] [-n] [-r] [-x] static int edit; static int replay; -enum { REVERT, CHERRY_PICK } action; +static enum { REVERT, CHERRY_PICK } action; static int no_commit; static struct commit *commit; static int needed_deref;
@@ -104,7 +104,7 @@ static char *get_oneline(const char *message) return result; } -char *get_encoding(const char *message) +static char *get_encoding(const char *message) { const char *p = message, *eol;
@@ -126,7 +126,7 @@ char *get_encoding(const char *message) return NULL; } -struct lock_file msg_file; +static struct lock_file msg_file; static int msg_fd; static void add_to_msg(const char *string)
diff --git a/commit.c b/commit.c
index bee066f..be0c76d 100644
--- a/commit.c
+++ b/commit.c@@ -27,7 +27,7 @@ struct sort_node const char *commit_type = "commit"; -struct cmt_fmt_map { +static struct cmt_fmt_map { const char *n; size_t cmp_len; enum cmit_fmt v;
diff --git a/daemon.c b/daemon.c
index b79e905..64f1f34 100644
--- a/daemon.c
+++ b/daemon.c@@ -439,7 +439,7 @@ static void parse_extra_args(struct interp *table, char *extra_args, int buflen) } } -void fill_in_extra_table_entries(struct interp *itable) +static void fill_in_extra_table_entries(struct interp *itable) { char *hp;
diff --git a/refs.c b/refs.c
index 89876bf..820e6ac 100644
--- a/refs.c
+++ b/refs.c@@ -150,7 +150,7 @@ static struct ref_list *sort_ref_list(struct ref_list *list) * Future: need to be in "struct repository" * when doing a full libification. */ -struct cached_refs { +static struct cached_refs { char did_loose; char did_packed; struct ref_list *loose;
diff --git a/upload-pack.c b/upload-pack.c
index d3a09e7..1046ea9 100644
--- a/upload-pack.c
+++ b/upload-pack.c@@ -62,7 +62,7 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz) return safe_write(fd, data, sz); } -FILE *pack_pipe = NULL; +static FILE *pack_pipe = NULL; static void show_commit(struct commit *commit) { if (commit->object.flags & BOUNDARY)
diff --git a/wt-status.c b/wt-status.c
index a055990..fd8a877 100644
--- a/wt-status.c
+++ b/wt-status.c@@ -197,7 +197,7 @@ static void wt_read_cache(struct wt_status *s) read_cache(); } -void wt_status_print_initial(struct wt_status *s) +static void wt_status_print_initial(struct wt_status *s) { int i; char buf[PATH_MAX];
--
1.5.2