summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-21 10:51:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-21 10:51:59 (GMT)
commit9d24ed4f019e035eeb8125c2c595876ad1211a3a (patch)
treec9841029a92f8f5d509eacdc88f7e6364b40ec2c /tree-walk.c
parent3bec0da08d6df03a103ddc4237cf2c79992c7dd4 (diff)
parent1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff)
downloadgit-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 'tree-walk.c')
-rw-r--r--tree-walk.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 297c697..3f83e98 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -43,7 +43,7 @@ void update_tree_entry(struct tree_desc *desc)
if (size < len)
die("corrupt tree file");
- desc->buf = buf + len;
+ desc->buf = (char *) buf + len;
desc->size = size - len;
}
@@ -66,7 +66,7 @@ const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pat
const void *tree = desc->buf;
unsigned long size = desc->size;
int len = strlen(tree)+1;
- const unsigned char *sha1 = tree + len;
+ const unsigned char *sha1 = (unsigned char *) tree + len;
const char *path;
unsigned int mode;
@@ -80,7 +80,8 @@ const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pat
int tree_entry(struct tree_desc *desc, struct name_entry *entry)
{
- const void *tree = desc->buf, *path;
+ const void *tree = desc->buf;
+ const char *path;
unsigned long len, size = desc->size;
if (!size)
@@ -95,10 +96,10 @@ int tree_entry(struct tree_desc *desc, struct name_entry *entry)
entry->pathlen = len;
path += len + 1;
- entry->sha1 = path;
+ entry->sha1 = (const unsigned char *) path;
path += 20;
- len = path - tree;
+ len = path - (char *) tree;
if (len > size)
die("corrupt tree file");