diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
commit | e94528a0e99ea54520b8aff016275a7622c55a47 (patch) | |
tree | bd4910fd81a2c85a67b2325f72c923b12875bf06 /tree-walk.c | |
parent | c0a2e1c0ba0956951b566888340e66589901b72d (diff) | |
parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) |
Merge branch 'ff/c99'
* ff/c99:
Remove all void-pointer arithmetic.
Change types used in bitfields to be `int's.
Don't use empty structure initializers.
Cast pointers to `void *' when used in a format.
Don't instantiate structures with FAMs.
Initialize FAMs using `FLEX_ARRAY'.
Remove ranges from switch statements.
Diffstat (limited to 'tree-walk.c')
-rw-r--r-- | tree-walk.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tree-walk.c b/tree-walk.c index 297c6972b9..3f83e98f3a 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"); |