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 /read-cache.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 'read-cache.c')
| -rw-r--r-- | read-cache.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/read-cache.c b/read-cache.c index c499c51..3c32aae 100644 --- a/read-cache.c +++ b/read-cache.c @@ -706,7 +706,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size) SHA1_Init(&c); SHA1_Update(&c, hdr, size - 20); SHA1_Final(sha1, &c); - if (memcmp(sha1, (void *)hdr + size - 20, 20)) + if (memcmp(sha1, (char *) hdr + size - 20, 20)) return error("bad index file sha1 signature"); return 0; } @@ -770,7 +770,7 @@ int read_cache(void) offset = sizeof(*hdr); for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = map + offset; + struct cache_entry *ce = (struct cache_entry *) ((char *) map + offset); offset = offset + ce_size(ce); active_cache[i] = ce; } @@ -783,10 +783,11 @@ int read_cache(void) * in 4-byte network byte order. */ unsigned long extsize; - memcpy(&extsize, map + offset + 4, 4); + memcpy(&extsize, (char *) map + offset + 4, 4); extsize = ntohl(extsize); - if (read_index_extension(map + offset, - map + offset + 8, extsize) < 0) + if (read_index_extension(((const char *) map) + offset, + (char *) map + offset + 8, + extsize) < 0) goto unmap; offset += 8; offset += extsize; @@ -820,7 +821,7 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len) } write_buffer_len = buffered; len -= partial; - data += partial; + data = (char *) data + partial; } return 0; } |