Fix sparse warnings

Make some functions static and convert func() function prototypes to to
func(void).  Fix declaration after statement, missing declaration and
redundant declaration warnings.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/cache.h b/cache.h
index a7c1bbd51cac6f7c1c8307d5ad04467e4d6d1a57..c7c6637b1ff0135281cabd800efbbf38ee72d627 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -203,6 +203,7 @@ int git_mkstemp(char *path, size_t n, const char *template);
 
 int safe_create_leading_directories(char *path);
 char *safe_strncpy(char *, const char *, size_t);
 
 int safe_create_leading_directories(char *path);
 char *safe_strncpy(char *, const char *, size_t);

+char *enter_repo(char *path, int strict);

 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size);

diff --git a/name-rev.c b/name-rev.c
index 59194f1349ff4df860dd9ee4a3f183e17b72b6fc..817e36b793aa1560d43b27682afe6631564e5738 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -230,8 +230,6 @@ int main(int argc, char **argv)
                                fwrite(p_start, p - p_start, 1, stdout);
                }
        } else if (all) {
                                fwrite(p_start, p - p_start, 1, stdout);
                }
        } else if (all) {

-               extern struct object **objs;
-               extern int nr_objs;

                int i;
 
                for (i = 0; i < nr_objs; i++)
                int i;
 
                for (i = 0; i < nr_objs; i++)

diff --git a/pack-redundant.c b/pack-redundant.c
index fb6cb48502fe9316d9cd46fb4f191e143aa811fa..15193854e5ca233f9fc7c31cb9362b055fdec0c0 100644 (file)
--- a/pack-redundant.c
+++ b/pack-redundant.c
@@ -11,19 +11,19 @@
 static const char pack_redundant_usage[] =
 "git-pack-redundant [ --verbose ] [ --alt-odb ] < --all | <.pack filename> ...>";
 
 static const char pack_redundant_usage[] =
 "git-pack-redundant [ --verbose ] [ --alt-odb ] < --all | <.pack filename> ...>";
 

-int load_all_packs = 0, verbose = 0, alt_odb = 0;
+static int load_all_packs = 0, verbose = 0, alt_odb = 0;

 
 struct llist_item {
        struct llist_item *next;
        char *sha1;
 };
 
 struct llist_item {
        struct llist_item *next;
        char *sha1;
 };

-struct llist {
+static struct llist {

        struct llist_item *front;
        struct llist_item *back;
        size_t size;
 } *all_objects; /* all objects which must be present in local packfiles */
 
        struct llist_item *front;
        struct llist_item *back;
        size_t size;
 } *all_objects; /* all objects which must be present in local packfiles */
 

-struct pack_list {
+static struct pack_list {

        struct pack_list *next;
        struct packed_git *pack;
        struct llist *unique_objects;
        struct pack_list *next;
        struct packed_git *pack;
        struct llist *unique_objects;


@@ -36,7 +36,7 @@ struct pll {
        size_t pl_size;
 };
 
        size_t pl_size;
 };
 

-inline void llist_free(struct llist *list)
+static inline void llist_free(struct llist *list)

 {
        while((list->back = list->front)) {
                list->front = list->front->next;
 {
        while((list->back = list->front)) {
                list->front = list->front->next;


@@ -45,14 +45,14 @@ inline void llist_free(struct llist *list)
        free(list);
 }
 
        free(list);
 }
 

-inline void llist_init(struct llist **list)
+static inline void llist_init(struct llist **list)

 {
        *list = xmalloc(sizeof(struct llist));
        (*list)->front = (*list)->back = NULL;
        (*list)->size = 0;
 }
 
 {
        *list = xmalloc(sizeof(struct llist));
        (*list)->front = (*list)->back = NULL;
        (*list)->size = 0;
 }
 

-struct llist * llist_copy(struct llist *list)
+static struct llist * llist_copy(struct llist *list)

 {
        struct llist *ret;
        struct llist_item *new, *old, *prev;
 {
        struct llist *ret;
        struct llist_item *new, *old, *prev;


@@ -79,7 +79,7 @@ struct llist * llist_copy(struct llist *list)
        return ret;
 }
 
        return ret;
 }
 

-inline struct llist_item * llist_insert(struct llist *list,
+static inline struct llist_item * llist_insert(struct llist *list,

                                        struct llist_item *after, char *sha1)
 {
        struct llist_item *new = xmalloc(sizeof(struct llist_item));
                                        struct llist_item *after, char *sha1)
 {
        struct llist_item *new = xmalloc(sizeof(struct llist_item));


@@ -102,12 +102,12 @@ inline struct llist_item * llist_insert(struct llist *list,
        return new;
 }
 
        return new;
 }
 

-inline struct llist_item * llist_insert_back(struct llist *list, char *sha1)
+static inline struct llist_item * llist_insert_back(struct llist *list, char *sha1)

 {
        return llist_insert(list, list->back, sha1);
 }
 
 {
        return llist_insert(list, list->back, sha1);
 }
 

-inline struct llist_item * llist_insert_sorted_unique(struct llist *list,
+static inline struct llist_item * llist_insert_sorted_unique(struct llist *list,

                                        char *sha1, struct llist_item *hint)
 {
        struct llist_item *prev = NULL, *l;
                                        char *sha1, struct llist_item *hint)
 {
        struct llist_item *prev = NULL, *l;


@@ -129,7 +129,7 @@ inline struct llist_item * llist_insert_sorted_unique(struct llist *list,
 }
 
 /* returns a pointer to an item in front of sha1 */
 }
 
 /* returns a pointer to an item in front of sha1 */

-inline struct llist_item * llist_sorted_remove(struct llist *list, char *sha1,
+static inline struct llist_item * llist_sorted_remove(struct llist *list, char *sha1,

                                               struct llist_item *hint)
 {
        struct llist_item *prev, *l;
                                               struct llist_item *hint)
 {
        struct llist_item *prev, *l;


@@ -164,7 +164,7 @@ inline struct llist_item * llist_sorted_remove(struct llist *list, char *sha1,
 }
 
 /* computes A\B */
 }
 
 /* computes A\B */

-void llist_sorted_difference_inplace(struct llist *A,
+static void llist_sorted_difference_inplace(struct llist *A,

                                     struct llist *B)
 {
        struct llist_item *hint, *b;
                                     struct llist *B)
 {
        struct llist_item *hint, *b;


@@ -178,7 +178,7 @@ void llist_sorted_difference_inplace(struct llist *A,
        }
 }
 
        }
 }
 

-inline struct pack_list * pack_list_insert(struct pack_list **pl,
+static inline struct pack_list * pack_list_insert(struct pack_list **pl,

                                           struct pack_list *entry)
 {
        struct pack_list *p = xmalloc(sizeof(struct pack_list));
                                           struct pack_list *entry)
 {
        struct pack_list *p = xmalloc(sizeof(struct pack_list));


@@ -188,7 +188,7 @@ inline struct pack_list * pack_list_insert(struct pack_list **pl,
        return p;
 }
 
        return p;
 }
 

-inline size_t pack_list_size(struct pack_list *pl)
+static inline size_t pack_list_size(struct pack_list *pl)

 {
        size_t ret = 0;
        while(pl) {
 {
        size_t ret = 0;
        while(pl) {


@@ -198,7 +198,7 @@ inline size_t pack_list_size(struct pack_list *pl)
        return ret;
 }
 
        return ret;
 }
 

-struct pack_list * pack_list_difference(struct pack_list *A,
+static struct pack_list * pack_list_difference(struct pack_list *A,

                                        struct pack_list *B)
 {
        struct pack_list *ret, *pl;
                                        struct pack_list *B)
 {
        struct pack_list *ret, *pl;


@@ -218,7 +218,7 @@ struct pack_list * pack_list_difference(struct pack_list *A,
        return ret;
 }
 
        return ret;
 }
 

-void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
+static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)

 {
        int p1_off, p2_off;
        void *p1_base, *p2_base;
 {
        int p1_off, p2_off;
        void *p1_base, *p2_base;


@@ -250,7 +250,7 @@ void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
        }
 }
 
        }
 }
 

-void pll_insert(struct pll **pll, struct pll **hint_table)
+static void pll_insert(struct pll **pll, struct pll **hint_table)

 {
        struct pll *prev;
        int i = (*pll)->pl_size - 1;
 {
        struct pll *prev;
        int i = (*pll)->pl_size - 1;


@@ -276,7 +276,7 @@ void pll_insert(struct pll **pll, struct pll **hint_table)
 /* all the permutations have to be free()d at the same time,
  * since they refer to each other
  */
 /* all the permutations have to be free()d at the same time,
  * since they refer to each other
  */

-struct pll * get_all_permutations(struct pack_list *list)
+static struct pll * get_all_permutations(struct pack_list *list)

 {
        struct pll *subset, *pll, *new_pll = NULL; /*silence warning*/
        static struct pll **hint = NULL;
 {
        struct pll *subset, *pll, *new_pll = NULL; /*silence warning*/
        static struct pll **hint = NULL;


@@ -323,7 +323,7 @@ struct pll * get_all_permutations(struct pack_list *list)
        return hint[0];
 }
 
        return hint[0];
 }
 

-int is_superset(struct pack_list *pl, struct llist *list)
+static int is_superset(struct pack_list *pl, struct llist *list)

 {
        struct llist *diff;
 
 {
        struct llist *diff;
 


@@ -342,7 +342,7 @@ int is_superset(struct pack_list *pl, struct llist *list)
        return 0;
 }
 
        return 0;
 }
 

-size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
+static size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)

 {
        size_t ret = 0;
        int p1_off, p2_off;
 {
        size_t ret = 0;
        int p1_off, p2_off;


@@ -373,14 +373,14 @@ size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
 }
 
 /* another O(n^2) function ... */
 }
 
 /* another O(n^2) function ... */

-size_t get_pack_redundancy(struct pack_list *pl)
+static size_t get_pack_redundancy(struct pack_list *pl)

 {
        struct pack_list *subset;
 {
        struct pack_list *subset;

+       size_t ret = 0;

 
        if (pl == NULL)
                return 0;
 
 
        if (pl == NULL)
                return 0;
 

-       size_t ret = 0;

        while ((subset = pl->next)) {
                while(subset) {
                        ret += sizeof_union(pl->pack, subset->pack);
        while ((subset = pl->next)) {
                while(subset) {
                        ret += sizeof_union(pl->pack, subset->pack);


@@ -391,7 +391,7 @@ size_t get_pack_redundancy(struct pack_list *pl)
        return ret;
 }
 
        return ret;
 }
 

-inline size_t pack_set_bytecount(struct pack_list *pl)
+static inline size_t pack_set_bytecount(struct pack_list *pl)

 {
        size_t ret = 0;
        while (pl) {
 {
        size_t ret = 0;
        while (pl) {


@@ -402,7 +402,7 @@ inline size_t pack_set_bytecount(struct pack_list *pl)
        return ret;
 }
 
        return ret;
 }
 

-void minimize(struct pack_list **min)
+static void minimize(struct pack_list **min)

 {
        struct pack_list *pl, *unique = NULL,
                *non_unique = NULL, *min_perm = NULL;
 {
        struct pack_list *pl, *unique = NULL,
                *non_unique = NULL, *min_perm = NULL;


@@ -469,7 +469,7 @@ void minimize(struct pack_list **min)
        }
 }
 
        }
 }
 

-void load_all_objects()
+static void load_all_objects(void)

 {
        struct pack_list *pl = local_packs;
        struct llist_item *hint, *l;
 {
        struct pack_list *pl = local_packs;
        struct llist_item *hint, *l;


@@ -497,7 +497,7 @@ void load_all_objects()
 }
 
 /* this scales like O(n^2) */
 }
 
 /* this scales like O(n^2) */

-void cmp_local_packs()
+static void cmp_local_packs(void)

 {
        struct pack_list *subset, *pl = local_packs;
 
 {
        struct pack_list *subset, *pl = local_packs;
 


@@ -508,7 +508,7 @@ void cmp_local_packs()
        }
 }
 
        }
 }
 

-void scan_alt_odb_packs()
+static void scan_alt_odb_packs(void)

 {
        struct pack_list *local, *alt;
 
 {
        struct pack_list *local, *alt;
 


@@ -524,7 +524,7 @@ void scan_alt_odb_packs()
        }
 }
 
        }
 }
 

-struct pack_list * add_pack(struct packed_git *p)
+static struct pack_list * add_pack(struct packed_git *p)

 {
        struct pack_list l;
        size_t off;
 {
        struct pack_list l;
        size_t off;


@@ -550,7 +550,7 @@ struct pack_list * add_pack(struct packed_git *p)
                return pack_list_insert(&altodb_packs, &l);
 }
 
                return pack_list_insert(&altodb_packs, &l);
 }
 

-struct pack_list * add_pack_file(char *filename)
+static struct pack_list * add_pack_file(char *filename)

 {
        struct packed_git *p = packed_git;
 
 {
        struct packed_git *p = packed_git;
 


@@ -565,7 +565,7 @@ struct pack_list * add_pack_file(char *filename)
        die("Filename %s not found in packed_git\n", filename);
 }
 
        die("Filename %s not found in packed_git\n", filename);
 }
 

-void load_all()
+static void load_all(void)

 {
        struct packed_git *p = packed_git;
 
 {
        struct packed_git *p = packed_git;
 

diff --git a/path.c b/path.c
index d635470de1ad9f8a0f43e264d27f3d4c4b9b8705..84b3272d94dbc301131d55660be41d5150a1cdef 100644 (file)
--- a/path.c
+++ b/path.c
@@ -131,7 +131,7 @@ int validate_symref(const char *path)
        return -1;
 }
 
        return -1;
 }
 

-static char *current_dir()
+static char *current_dir(void)

 {
        return getcwd(pathname, sizeof(pathname));
 }
 {
        return getcwd(pathname, sizeof(pathname));
 }