diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-21 10:51:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 10:51:59 (GMT) |
| commit | 9d24ed4f019e035eeb8125c2c595876ad1211a3a (patch) | |
| tree | c9841029a92f8f5d509eacdc88f7e6364b40ec2c /pack-objects.c | |
| parent | 3bec0da08d6df03a103ddc4237cf2c79992c7dd4 (diff) | |
| parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) | |
| download | git-9d24ed4f019e035eeb8125c2c595876ad1211a3a.zip git-9d24ed4f019e035eeb8125c2c595876ad1211a3a.tar.gz git-9d24ed4f019e035eeb8125c2c595876ad1211a3a.tar.bz2 | |
Merge branch 'ff/c99' into next
* ff/c99:
Remove all void-pointer arithmetic.
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pack-objects.c b/pack-objects.c index 7a8c16c..bed2497 100644 --- 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++) { - unsigned int hl = *((unsigned int *)(index + 24 * i)); + unsigned int hl = *((unsigned int *)((char *) index + 24*i)); rix->revindex[i] = ntohl(hl); } /* This knows the pack format -- the 20-byte trailer @@ -300,7 +300,7 @@ static unsigned long write_object(struct sha1file *f, use_packed_git(p); datalen = find_packed_object_size(p, entry->in_pack_offset); - buf = p->pack_base + entry->in_pack_offset; + buf = (char *) p->pack_base + entry->in_pack_offset; sha1write(f, buf, datalen); unuse_packed_git(p); hdrlen = 0; /* not really */ |