mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all void-pointer arithmetic.

Browse Source 
ANSI C99 doesn't allow void-pointer arithmetic. This patch fixes this in
various ways. Usually the strategy that required the least changes was used.

Signed-off-by: Florian Forster <octo@verplant.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Florian Forster
2006-06-18 17:18:09 +02:00
committed by Junio C Hamano
parent 2bda77e080
commit 1d7f171c3a
19 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
read-cache.c
View File

@ -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;
}