From b99a394cd1e7042ad219046a6ea81ad3f93004ca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Nov 2005 16:08:36 -0800 Subject: [PATCH] pack-redundant: type cleanups. Binary representation of object names are unsigned char[20], not signed. Also verbose output had %lu format printing size_t without (unsigned long) cast other places already had, so match that. Using format %zu was suggested but might not be supported as widely. Noted by Morten Welinder, fixed with input from H. Peter Anvin and Hideaki Yoshifuji. Signed-off-by: Junio C Hamano --- pack-redundant.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pack-redundant.c b/pack-redundant.c index b38baa9475..793fa08096 100644 --- a/pack-redundant.c +++ b/pack-redundant.c @@ -15,7 +15,7 @@ static int load_all_packs = 0, verbose = 0, alt_odb = 0; struct llist_item { struct llist_item *next; - char *sha1; + unsigned char *sha1; }; static struct llist { struct llist_item *front; @@ -100,7 +100,8 @@ static struct llist * llist_copy(struct llist *list) } static inline struct llist_item * llist_insert(struct llist *list, - struct llist_item *after, char *sha1) + struct llist_item *after, + unsigned char *sha1) { struct llist_item *new = llist_item_get(); new->sha1 = sha1; @@ -122,13 +123,12 @@ static inline struct llist_item * llist_insert(struct llist *list, return new; } -static inline struct llist_item * llist_insert_back(struct llist *list, char *sha1) +static inline struct llist_item *llist_insert_back(struct llist *list, unsigned char *sha1) { return llist_insert(list, list->back, sha1); } -static inline struct llist_item * llist_insert_sorted_unique(struct llist *list, - char *sha1, struct llist_item *hint) +static inline struct llist_item *llist_insert_sorted_unique(struct llist *list, unsigned char *sha1, struct llist_item *hint) { struct llist_item *prev = NULL, *l; @@ -149,9 +149,7 @@ static inline struct llist_item * llist_insert_sorted_unique(struct llist *list, } /* returns a pointer to an item in front of sha1 */ -static inline struct llist_item * llist_sorted_remove(struct llist *list, - const char *sha1, - struct llist_item *hint) +static inline struct llist_item * llist_sorted_remove(struct llist *list, const unsigned char *sha1, struct llist_item *hint) { struct llist_item *prev, *l; @@ -599,7 +597,8 @@ int main(int argc, char **argv) int i; struct pack_list *min, *red, *pl; struct llist *ignore; - char *sha1, buf[42]; /* 40 byte sha1 + \n + \0 */ + unsigned char *sha1; + char buf[42]; /* 40 byte sha1 + \n + \0 */ for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -686,7 +685,8 @@ int main(int argc, char **argv) pl = pl->next; } if (verbose) - fprintf(stderr, "%luMB of redundant packs in total.\n", pack_set_bytecount(red)/(1024*1024)); + fprintf(stderr, "%luMB of redundant packs in total.\n", + (unsigned long)pack_set_bytecount(red)/(1024*1024)); return 0; }