diff options
author | Martin Koegler <martin.koegler@chello.at> | 2017-08-16 22:16:30 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-16 21:05:00 -0700 |
commit | 8b9bd2e9470ef930c3876f49341489bd594f7959 (patch) | |
tree | 504bcd9335991071b729e6f1fbcf3b46c7920c3e | |
parent | 6c34f6102fc990bde13a38f80958900bd1e610a6 (diff) | |
download | git-8b9bd2e9470ef930c3876f49341489bd594f7959.tar.gz |
Convert tree-walk to size_t
Signed-off-by: Martin Koegler <martin.koegler@chello.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | tree-walk.c | 17 | ||||
-rw-r--r-- | tree-walk.h | 4 | ||||
-rw-r--r-- | tree.h | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/tree-walk.c b/tree-walk.c index 7c9f9e3d0a..a7d8b2ae8b 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -22,10 +22,11 @@ static const char *get_mode(const char *str, unsigned int *modep) return str; } -static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size, struct strbuf *err) +static int decode_tree_entry(struct tree_desc *desc, const char *buf, size_t size, struct strbuf *err) { const char *path; - unsigned int mode, len; + unsigned int mode; + size_t len; if (size < 23 || buf[size - 21]) { strbuf_addstr(err, _("too-short tree object")); @@ -51,7 +52,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l return 0; } -static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer, unsigned long size, struct strbuf *err) +static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer, size_t size, struct strbuf *err) { desc->buffer = buffer; desc->size = size; @@ -60,7 +61,7 @@ static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer, u return 0; } -void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size) +void init_tree_desc(struct tree_desc *desc, const void *buffer, size_t size) { struct strbuf err = STRBUF_INIT; if (init_tree_desc_internal(desc, buffer, size, &err)) @@ -68,7 +69,7 @@ void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long si strbuf_release(&err); } -int init_tree_desc_gently(struct tree_desc *desc, const void *buffer, unsigned long size) +int init_tree_desc_gently(struct tree_desc *desc, const void *buffer, size_t size) { struct strbuf err = STRBUF_INIT; int result = init_tree_desc_internal(desc, buffer, size, &err); @@ -106,8 +107,8 @@ static int update_tree_entry_internal(struct tree_desc *desc, struct strbuf *err { const void *buf = desc->buffer; const unsigned char *end = desc->entry.oid->hash + 20; - unsigned long size = desc->size; - unsigned long len = end - (const unsigned char *)buf; + size_t size = desc->size; + size_t len = end - (const unsigned char *)buf; if (size < len) die(_("too-short tree file")); @@ -487,7 +488,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info) struct dir_state { void *tree; - unsigned long size; + size_t size; unsigned char sha1[20]; }; diff --git a/tree-walk.h b/tree-walk.h index 68bb78b928..9160cc20e5 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -32,8 +32,8 @@ static inline int tree_entry_len(const struct name_entry *ne) void update_tree_entry(struct tree_desc *); int update_tree_entry_gently(struct tree_desc *); -void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size); -int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size); +void init_tree_desc(struct tree_desc *desc, const void *buf, size_t size); +int init_tree_desc_gently(struct tree_desc *desc, const void *buf, size_t size); /* * Helper function that does both tree_entry_extract() and update_tree_entry() @@ -9,7 +9,7 @@ struct strbuf; struct tree { struct object object; void *buffer; - unsigned long size; + size_t size; }; struct tree *lookup_tree(const struct object_id *oid); |