@matheusbsbs / matheus-bagliano / commits / b99a394cd1
Fork 0

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 <junkio@cox.net>

Junio C Hamano committed Nov 23, 2005 at 16:08 UTC b99a394cd1e7042ad219046a6ea81ad3f93004ca
1 file changed +10 -10
pack-redundant.c
+10 -10
@@ -15,7 +15,7 @@ static int load_all_packs = 0, verbose = 0, alt_odb = 0;
15
16 struct llist_item {
17 struct llist_item *next;
18 - char *sha1;
18 + unsigned char *sha1;
19 };
20 static struct llist {
21 struct llist_item *front;
@@ -100,7 +100,8 @@ static struct llist * llist_copy(struct llist *list)
100 }
101
102 static inline struct llist_item * llist_insert(struct llist *list,
103 - struct llist_item *after, char *sha1)
103 + struct llist_item *after,
104 + unsigned char *sha1)
105 {
106 struct llist_item *new = llist_item_get();
107 new->sha1 = sha1;
@@ -122,13 +123,12 @@ static inline struct llist_item * llist_insert(struct llist *list,
123 return new;
124 }
125
125 -static inline struct llist_item * llist_insert_back(struct llist *list, char *sha1)
126 +static inline struct llist_item *llist_insert_back(struct llist *list, unsigned char *sha1)
127 {
128 return llist_insert(list, list->back, sha1);
129 }
130
130 -static inline struct llist_item * llist_insert_sorted_unique(struct llist *list,
131 - char *sha1, struct llist_item *hint)
131 +static inline struct llist_item *llist_insert_sorted_unique(struct llist *list, unsigned char *sha1, struct llist_item *hint)
132 {
133 struct llist_item *prev = NULL, *l;
134
@@ -149,9 +149,7 @@ static inline struct llist_item * llist_insert_sorted_unique(struct llist *list,
149 }
150
151 /* returns a pointer to an item in front of sha1 */
152 -static inline struct llist_item * llist_sorted_remove(struct llist *list,
153 - const char *sha1,
154 - struct llist_item *hint)
152 +static inline struct llist_item * llist_sorted_remove(struct llist *list, const unsigned char *sha1, struct llist_item *hint)
153 {
154 struct llist_item *prev, *l;
155
@@ -599,7 +597,8 @@ int main(int argc, char **argv)
597 int i;
598 struct pack_list *min, *red, *pl;
599 struct llist *ignore;
602 - char *sha1, buf[42]; /* 40 byte sha1 + \n + \0 */
600 + unsigned char *sha1;
601 + char buf[42]; /* 40 byte sha1 + \n + \0 */
602
603 for (i = 1; i < argc; i++) {
604 const char *arg = argv[i];
@@ -686,7 +685,8 @@ int main(int argc, char **argv)
685 pl = pl->next;
686 }
687 if (verbose)
689 - fprintf(stderr, "%luMB of redundant packs in total.\n", pack_set_bytecount(red)/(1024*1024));
688 + fprintf(stderr, "%luMB of redundant packs in total.\n",
689 + (unsigned long)pack_set_bytecount(red)/(1024*1024));
690
691 return 0;
692 }