From: Linus Torvalds Date: Sun, 3 Jul 2005 17:10:45 +0000 (-0700) Subject: Fix sparse warnings. X-Git-Tag: v0.99~95 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6da4016aea2dc5bf311fea160bd8ef96ca82b999;p=git.git Fix sparse warnings. Mainly making a lot of local functions and variables be marked "static", but there was a "zero as NULL" warning in there too. --- diff --git a/apply.c b/apply.c index c81b0a24..701c01a3 100644 --- a/apply.c +++ b/apply.c @@ -724,8 +724,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch) return offset + hdrsize + patchsize; } -const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"; -const char minuses[]= "----------------------------------------------------------------------"; +static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"; +static const char minuses[]= "----------------------------------------------------------------------"; static void show_stats(struct patch *patch) { diff --git a/cvs2git.c b/cvs2git.c index ab059087..8c50e67d 100644 --- a/cvs2git.c +++ b/cvs2git.c @@ -206,7 +206,7 @@ static void update_file(char *line) printf("git-update-cache --add -- '%s'\n", name); } -struct hdrentry { +static struct hdrentry { const char *name; char *dest; } hdrs[] = { diff --git a/epoch.c b/epoch.c index 3cbff72b..6dbcfb34 100644 --- a/epoch.c +++ b/epoch.c @@ -28,7 +28,7 @@ static BN_CTX *context = NULL; static struct fraction *one = NULL; static struct fraction *zero = NULL; -static BN_CTX *get_BN_CTX() +static BN_CTX *get_BN_CTX(void) { if (!context) { context = BN_CTX_new(); @@ -36,7 +36,7 @@ static BN_CTX *get_BN_CTX() return context; } -static struct fraction *new_zero() +static struct fraction *new_zero(void) { struct fraction *result = xmalloc(sizeof(*result)); BN_init(&result->numerator); @@ -75,7 +75,7 @@ static struct fraction *init_fraction(struct fraction *fraction) return fraction; } -static struct fraction *get_one() +static struct fraction *get_one(void) { if (!one) { one = new_zero(); @@ -84,7 +84,7 @@ static struct fraction *get_one() return one; } -static struct fraction *get_zero() +static struct fraction *get_zero(void) { if (!zero) { zero = new_zero(); diff --git a/ls-tree.c b/ls-tree.c index 450bff24..8d524b89 100644 --- a/ls-tree.c +++ b/ls-tree.c @@ -79,7 +79,7 @@ static struct tree_entry_list *find_entry(const char *path) slash = strchr(path, '/'); if (!slash) { len = strlen(path); - next = 0; + next = NULL; } else { next = slash + 1; diff --git a/receive-pack.c b/receive-pack.c index d05f7d5e..dfa7cd1d 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -25,7 +25,7 @@ struct command { char ref_name[0]; }; -struct command *commands = NULL; +static struct command *commands = NULL; static int is_all_zeroes(const char *hex) { diff --git a/rev-list.c b/rev-list.c index 362342ea..fb75c22b 100644 --- a/rev-list.c +++ b/rev-list.c @@ -310,7 +310,7 @@ static struct commit_list *find_bisection(struct commit_list *list) return best; } -struct commit_list *limit_list(struct commit_list *list) +static struct commit_list *limit_list(struct commit_list *list) { struct commit_list *newlist = NULL; struct commit_list **p = &newlist; diff --git a/sha1_file.c b/sha1_file.c index a4ed4f9c..b18e467d 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -531,7 +531,7 @@ int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void return inflate(stream, 0); } -void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size) +static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size) { int bytes = strlen(buffer) + 1; unsigned char *buf = xmalloc(1+size); diff --git a/ssh-pull.c b/ssh-pull.c index 87d52389..26356dd7 100644 --- a/ssh-pull.c +++ b/ssh-pull.c @@ -29,7 +29,7 @@ int fetch(unsigned char *sha1) return ret; } -int get_version(void) +static int get_version(void) { char type = 'v'; write(fd_out, &type, 1); diff --git a/ssh-push.c b/ssh-push.c index db69c889..090d6f9f 100644 --- a/ssh-push.c +++ b/ssh-push.c @@ -4,10 +4,10 @@ #include -unsigned char local_version = 1; -unsigned char remote_version = 0; +static unsigned char local_version = 1; +static unsigned char remote_version = 0; -int serve_object(int fd_in, int fd_out) { +static int serve_object(int fd_in, int fd_out) { ssize_t size; int posn = 0; unsigned char sha1[20]; @@ -57,7 +57,7 @@ int serve_object(int fd_in, int fd_out) { return 0; } -int serve_version(int fd_in, int fd_out) +static int serve_version(int fd_in, int fd_out) { if (read(fd_in, &remote_version, 1) < 1) return -1; @@ -65,7 +65,7 @@ int serve_version(int fd_in, int fd_out) return 0; } -int serve_ref(int fd_in, int fd_out) +static int serve_ref(int fd_in, int fd_out) { char ref[PATH_MAX]; unsigned char sha1[20]; @@ -86,7 +86,7 @@ int serve_ref(int fd_in, int fd_out) } -void service(int fd_in, int fd_out) { +static void service(int fd_in, int fd_out) { char type; int retval; do {