Even more missing static

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

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index f0d4d9e2d10446a229094c991363f5a17ce4c666..62bd4b547b8c7efaa982cef61edf365466089eb6 100644 (file)
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -26,7 +26,7 @@ static int cleanup(char *line)
        return 1;
 }
 
        return 1;
 }
 

-void stripspace(FILE *in, FILE *out)
+static void stripspace(FILE *in, FILE *out)

 {
        int empties = -1;
        int incomplete = 0;
 {
        int empties = -1;
        int incomplete = 0;

diff --git a/builtin.h b/builtin.h
index fe8ba9e65f2158341ba72c60915c51471700161d..da4834c312445ae2b987000eba9891b7c3b265b5 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -7,7 +7,6 @@ extern const char git_version_string[];
 extern const char git_usage_string[];
 
 extern void help_unknown_cmd(const char *cmd);
 extern const char git_usage_string[];
 
 extern void help_unknown_cmd(const char *cmd);

-extern void stripspace(FILE *in, FILE *out);

 extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
 extern void prune_packed_objects(int);
 
 extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
 extern void prune_packed_objects(int);
 

diff --git a/commit.c b/commit.c
index 57b69ca7fa65ccec4502a53fd48d1684cfd09685..4ca4d44ba0d648c6c102ac17160b69f6f0f02836 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1116,15 +1116,6 @@ struct commit *pop_commit(struct commit_list **stack)
        return item;
 }
 
        return item;
 }
 

-int count_parents(struct commit * commit)
-{
-        int count;
-        struct commit_list * parents = commit->parents;
-        for (count = 0; parents; parents = parents->next,count++)
-               ;
-        return count;
-}
-

 void topo_sort_default_setter(struct commit *c, void *data)
 {
        c->util = data;
 void topo_sort_default_setter(struct commit *c, void *data)
 {
        c->util = data;

diff --git a/commit.h b/commit.h
index 75b43a53edcd082fbe148dad3ddc66e85471f0b4..a313b53c3106c6f2502bf02c86db47a0df5b0f6c 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -73,8 +73,6 @@ struct commit *pop_commit(struct commit_list **stack);
 
 void clear_commit_marks(struct commit *commit, unsigned int mark);
 
 
 void clear_commit_marks(struct commit *commit, unsigned int mark);
 

-int count_parents(struct commit * commit);
-

 /*
  * Performs an in-place topological sort of list supplied.
  *
 /*
  * Performs an in-place topological sort of list supplied.
  *

diff --git a/diff.c b/diff.c
index cafa7debeb7dd1f3ecc15f24bd41959fb12448d5..1d234d361d29605c49da8fa177ebb563cf3066c1 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2103,6 +2103,8 @@ static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *va
        return 1;
 }
 
        return 1;
 }
 

+static int diff_scoreopt_parse(const char *opt);
+

 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 {
        const char *arg = av[0];
 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 {
        const char *arg = av[0];


@@ -2274,7 +2276,7 @@ static int parse_num(const char **cp_p)
        return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
 }
 
        return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
 }
 

-int diff_scoreopt_parse(const char *opt)
+static int diff_scoreopt_parse(const char *opt)

 {
        int opt1, opt2, cmd;
 
 {
        int opt1, opt2, cmd;
 

diff --git a/diff.h b/diff.h
index 63738c1dd4c71cb1beacaffea40bf51377a137ea..a7ee6d8c87887b111ef84b95266e1ff43496e7c3 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -155,8 +155,6 @@ extern void diff_unmerge(struct diff_options *,
                         unsigned mode,
                         const unsigned char *sha1);
 
                         unsigned mode,
                         const unsigned char *sha1);
 

-extern int diff_scoreopt_parse(const char *opt);
-

 #define DIFF_SETUP_REVERSE             1
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
 #define DIFF_SETUP_REVERSE             1
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4

diff --git a/quote.c b/quote.c
index fb9e4ca253ea9bcadbcb55dcdd62be614c66758f..aa440098e1d8a771aa2d9d2e17355fd560f3c253 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -20,7 +20,7 @@ static inline int need_bs_quote(char c)
        return (c == '\'' || c == '!');
 }
 
        return (c == '\'' || c == '!');
 }
 

-size_t sq_quote_buf(char *dst, size_t n, const char *src)
+static size_t sq_quote_buf(char *dst, size_t n, const char *src)

 {
        char c;
        char *bp = dst;
 {
        char c;
        char *bp = dst;


@@ -62,18 +62,6 @@ void sq_quote_print(FILE *stream, const char *src)
        fputc('\'', stream);
 }
 
        fputc('\'', stream);
 }
 

-char *sq_quote(const char *src)
-{
-       char *buf;
-       size_t cnt;
-
-       cnt = sq_quote_buf(NULL, 0, src) + 1;
-       buf = xmalloc(cnt);
-       sq_quote_buf(buf, cnt, src);
-
-       return buf;
-}
-

 char *sq_quote_argv(const char** argv, int count)
 {
        char *buf, *to;
 char *sq_quote_argv(const char** argv, int count)
 {
        char *buf, *to;

diff --git a/quote.h b/quote.h
index bdc3610df51000baeda49da1eeaec20ccb2682fb..8a59cc55d1dcfba728614b2d6494272ceafbf3a1 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -28,9 +28,7 @@
  * excluding the final null regardless of the buffer size.
  */
 
  * excluding the final null regardless of the buffer size.
  */
 

-extern char *sq_quote(const char *src);

 extern void sq_quote_print(FILE *stream, const char *src);
 extern void sq_quote_print(FILE *stream, const char *src);

-extern size_t sq_quote_buf(char *dst, size_t n, const char *src);

 extern char *sq_quote_argv(const char** argv, int count);
 
 /*
 extern char *sq_quote_argv(const char** argv, int count);
 
 /*

diff --git a/upload-pack.c b/upload-pack.c
index 0e881c85b5cc5e128904d5a149634c077b62644d..fe96ef15c43fa6e3f8f947f84ddce3c498e82859 100644 (file)
--- 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);
 }
 
        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)
 static void show_commit(struct commit *commit)
 {
        if (commit->object.flags & BOUNDARY)