undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source 
* fix:
  Fix git-pack-objects for 64-bit platforms
This commit is contained in:
Junio C Hamano 2006-05-13 22:24:18 -07:00
commit 3a3e89b897
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pack-objects.c
View File

@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1)); rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
for (i = 0; i < num_ent; i++) { 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); rix->revindex[i] = ntohl(hl);
} }
/* This knows the pack format -- the 20-byte trailer /* This knows the pack format -- the 20-byte trailer

2
sha1_file.c
View File

@ -1161,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
int mi = (lo + hi) / 2; int mi = (lo + hi) / 2;
int cmp = memcmp(index + 24 * mi + 4, sha1, 20); int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
if (!cmp) { if (!cmp) {
e->offset = ntohl(*((int*)(index + 24 * mi))); e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
memcpy(e->sha1, sha1, 20); memcpy(e->sha1, sha1, 20);
e->p = p; e->p = p;
return 1; return 1;