Merge branch 'fix'

Junio C Hamano · Junio C Hamano · commit 3a3e89b897e1 · 2006-05-13T22:24:18.000-07:00
* fix:
  Fix git-pack-objects for 64-bit platforms
diff --git a/pack-objects.c b/pack-objects.c
@@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
 
 	rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
 	for (i = 0; i < num_ent; i++) {
-		long hl = *((long *)(index + 24 * i));
+		uint32_t hl = *((uint32_t *)(index + 24 * i));
 		rix->revindex[i] = ntohl(hl);
 	}
 	/* This knows the pack format -- the 20-byte trailer
diff --git a/sha1_file.c b/sha1_file.c
@@ -1161,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
 		int mi = (lo + hi) / 2;
 		int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
 		if (!cmp) {
-			e->offset = ntohl(*((int*)(index + 24 * mi)));
+			e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
 			memcpy(e->sha1, sha1, 20);
 			e->p = p;
 			return 1;

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)`
`156`	`156`
`157`	`157`	`rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));`
`158`	`158`	`for (i = 0; i < num_ent; i++) {`
`159`		`- long hl = ((long )(index + 24 * i));`
	`159`	`+ uint32_t hl = ((uint32_t )(index + 24 * i));`
`160`	`160`	`rix->revindex[i] = ntohl(hl);`
`161`	`161`	`}`
`162`	`162`	`/* This knows the pack format -- the 20-byte trailer`