Skip to content

Commit

Permalink
Fix sparse warnings
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Timo Hirvonen authored and Junio C Hamano committed Nov 21, 2005
1 parent 8fc66df commit bd22c90
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 32 deletions.
1 change: 1 addition & 0 deletions cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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);
Expand Down
2 changes: 0 additions & 2 deletions name-rev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ int main(int argc, char **argv)
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++)
Expand Down
58 changes: 29 additions & 29 deletions pack-redundant.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
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 {
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 pack_list {
static struct pack_list {
struct pack_list *next;
struct packed_git *pack;
struct llist *unique_objects;
Expand All @@ -36,7 +36,7 @@ struct pll {
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;
Expand All @@ -45,14 +45,14 @@ inline void llist_free(struct llist *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;
}

struct llist * llist_copy(struct llist *list)
static struct llist * llist_copy(struct llist *list)
{
struct llist *ret;
struct llist_item *new, *old, *prev;
Expand All @@ -79,7 +79,7 @@ struct llist * llist_copy(struct llist *list)
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));
Expand All @@ -102,12 +102,12 @@ inline struct llist_item * llist_insert(struct llist *list,
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);
}

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;
Expand All @@ -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 */
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;
Expand Down Expand Up @@ -164,7 +164,7 @@ inline struct llist_item * llist_sorted_remove(struct llist *list, char *sha1,
}

/* 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;
Expand All @@ -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));
Expand All @@ -188,7 +188,7 @@ inline struct pack_list * pack_list_insert(struct pack_list **pl,
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) {
Expand All @@ -198,7 +198,7 @@ inline size_t pack_list_size(struct pack_list *pl)
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;
Expand All @@ -218,7 +218,7 @@ struct pack_list * pack_list_difference(struct pack_list *A,
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;
Expand Down Expand Up @@ -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;
Expand All @@ -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
*/
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;
Expand Down Expand Up @@ -323,7 +323,7 @@ struct pll * get_all_permutations(struct pack_list *list)
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;

Expand All @@ -342,7 +342,7 @@ int is_superset(struct pack_list *pl, struct llist *list)
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;
Expand Down Expand Up @@ -373,14 +373,14 @@ size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
}

/* 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;
size_t ret = 0;

if (pl == NULL)
return 0;

size_t ret = 0;
while ((subset = pl->next)) {
while(subset) {
ret += sizeof_union(pl->pack, subset->pack);
Expand All @@ -391,7 +391,7 @@ size_t get_pack_redundancy(struct pack_list *pl)
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) {
Expand All @@ -402,7 +402,7 @@ inline size_t pack_set_bytecount(struct pack_list *pl)
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -497,7 +497,7 @@ void load_all_objects()
}

/* this scales like O(n^2) */
void cmp_local_packs()
static void cmp_local_packs(void)
{
struct pack_list *subset, *pl = local_packs;

Expand All @@ -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;

Expand All @@ -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;
Expand All @@ -550,7 +550,7 @@ struct pack_list * add_pack(struct packed_git *p)
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;

Expand All @@ -565,7 +565,7 @@ struct pack_list * add_pack_file(char *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;

Expand Down
2 changes: 1 addition & 1 deletion path.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ int validate_symref(const char *path)
return -1;
}

static char *current_dir()
static char *current_dir(void)
{
return getcwd(pathname, sizeof(pathname));
}
Expand Down

0 comments on commit bd22c90

Please sign in to comment.