development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

pack-objects: use unsigned int for counter and offset values

Browse source 
This is done in some of the new pack layout code introduced in commit
1b4bb16b9e. This more closely matches the nr_objects global that is
unsigned that these variables are based off of and bounded by.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dan McGee 2011-10-18 00:21:22 -05:00 committed by Junio C Hamano
parent be12681896
commit 92bef1a14a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
builtin/pack-objects.c
View file

@ -455,7 +455,7 @@ static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
}
static inline void add_to_write_order(struct object_entry **wo,
int *endp,
unsigned int *endp,
struct object_entry *e)
{
if (e->filled)
@ -465,7 +465,7 @@ static inline void add_to_write_order(struct object_entry **wo,
}
static void add_descendants_to_write_order(struct object_entry **wo,
int *endp,
unsigned int *endp,
struct object_entry *e)
{
struct object_entry *child;
@ -477,7 +477,7 @@ static void add_descendants_to_write_order(struct object_entry **wo,
}
static void add_family_to_write_order(struct object_entry **wo,
int *endp,
unsigned int *endp,
struct object_entry *e)
{
struct object_entry *root;
@ -490,7 +490,7 @@ static void add_family_to_write_order(struct object_entry **wo,
static struct object_entry **compute_write_order(void)
{
int i, wo_end;
unsigned int i, wo_end;
struct object_entry **wo = xmalloc(nr_objects * sizeof(*wo));
@ -506,8 +506,8 @@ static struct object_entry **compute_write_order(void)
* Make sure delta_sibling is sorted in the original
* recency order.
*/
for (i = nr_objects - 1; 0 <= i; i--) {
struct object_entry *e = &objects[i];
for (i = nr_objects; i > 0;) {
struct object_entry *e = &objects[--i];
if (!e->delta)
continue;
/* Mark me as the first child */