mass size_t conversion

Signed-off-by: Jeff King <[email protected]>

Author: peff

builtin/grep.c

@@ -639,7 +639,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 	}
 
 	while (tree_entry(tree, &entry)) {
-		int te_len = tree_entry_len(&entry);
+		size_t te_len = tree_entry_len(&entry);
 
 		if (match != all_entries_interesting) {
 			strbuf_addstr(&name, base->buf + tn_len);

read-cache.c

@@ -479,8 +479,8 @@ int ie_modified(struct index_state *istate,
 	return 0;
 }
 
-static int cache_name_stage_compare(const char *name1, int len1, int stage1,
-				    const char *name2, int len2, int stage2)
+static int cache_name_stage_compare(const char *name1, size_t len1, int stage1,
+				    const char *name2, size_t len2, int stage2)
 {
 	int cmp;
 

tree-diff.c

@@ -210,7 +210,7 @@ static void emit_path(struct combine_diff_path ***tail,
 	unsigned short mode;
 	const char *path;
 	const struct object_id *oid;
-	int pathlen;
+	size_t pathlen;
 	int old_baselen = base->len;
 	int i, isdir, recurse = 0, emitthis = 1;
 

tree-walk.c

@@ -16,7 +16,7 @@
 static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size, struct strbuf *err)
 {
 	const char *path;
-	unsigned int len;
+	size_t len;
 	uint16_t mode;
 	const unsigned hashsz = desc->algo->rawsz;
 
@@ -260,7 +260,7 @@ struct tree_desc_x {
 	struct tree_desc_skip *skip;
 };
 
-static int check_entry_match(const char *a, int a_len, const char *b, int b_len)
+static int check_entry_match(const char *a, size_t a_len, const char *b, size_t b_len)
 {
 	/*
 	 * The caller wants to pick *a* from a tree or nothing.
@@ -327,10 +327,10 @@ static int check_entry_match(const char *a, int a_len, const char *b, int b_len)
 static void extended_entry_extract(struct tree_desc_x *t,
 				   struct name_entry *a,
 				   const char *first,
-				   int first_len)
+				   size_t first_len)
 {
 	const char *path;
-	int len;
+	size_t len;
 	struct tree_desc probe;
 	struct tree_desc_skip *skip;
 
@@ -472,9 +472,9 @@ int traverse_trees(struct index_state *istate,
 		int trees_used;
 		unsigned long mask, dirmask;
 		const char *first = NULL;
-		int first_len = 0;
+		size_t first_len = 0;
 		struct name_entry *e = NULL;
-		int len;
+		size_t len;
 
 		for (i = 0; i < n; i++) {
 			e = entry + i;
@@ -571,7 +571,8 @@ static int find_tree_entry(struct repository *r, struct tree_desc *t,
 	while (t->size) {
 		const char *entry;
 		struct object_id oid;
-		int entrylen, cmp;
+		size_t entrylen;
+		int cmp;
 
 		oidcpy(&oid, tree_entry_extract(t, &entry, mode));
 		entrylen = tree_entry_len(&t->entry);
@@ -834,8 +835,8 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
 }
 
 static int match_entry(const struct pathspec_item *item,
-		       const struct name_entry *entry, int pathlen,
-		       const char *match, int matchlen,
+		       const struct name_entry *entry, size_t pathlen,
+		       const char *match, size_t matchlen,
 		       enum interesting *never_interesting)
 {
 	int m = -1; /* signals that we haven't called strncmp() */
@@ -926,10 +927,11 @@ static int match_entry(const struct pathspec_item *item,
 
 /* :(icase)-aware string compare */
 static int basecmp(const struct pathspec_item *item,
-		   const char *base, const char *match, int len)
+		   const char *base, const char *match, size_t len)
 {
 	if (item->magic & PATHSPEC_ICASE) {
-		int ret, n = len > item->prefix ? item->prefix : len;
+		int ret;
+		size_t n = len > item->prefix ? item->prefix : len;
 		ret = strncmp(base, match, n);
 		if (ret)
 			return ret;
@@ -942,7 +944,7 @@ static int basecmp(const struct pathspec_item *item,
 
 static int match_dir_prefix(const struct pathspec_item *item,
 			    const char *base,
-			    const char *match, int matchlen)
+			    const char *match, size_t matchlen)
 {
 	if (basecmp(item, base, match, matchlen))
 		return 0;
@@ -1021,7 +1023,7 @@ static enum interesting do_match(struct index_state *istate,
 				 int exclude)
 {
 	int i;
-	int pathlen, baselen = base->len;
+	size_t pathlen, baselen = base->len;
 	enum interesting never_interesting = ps->has_wildcard ?
 		entry_not_interesting : all_entries_not_interesting;
 

tree-walk.h

@@ -16,7 +16,7 @@ struct repository;
 struct name_entry {
 	struct object_id oid;
 	const char *path;
-	int pathlen;
+	size_t pathlen;
 	unsigned int mode;
 };
 
@@ -61,7 +61,7 @@ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc,
  * memory structure of a tree entry to avoid the overhead of using a
  * generic strlen().
  */
-static inline int tree_entry_len(const struct name_entry *ne)
+static inline size_t tree_entry_len(const struct name_entry *ne)
 {
 	return ne->pathlen;
 }

tree.c

@@ -22,7 +22,7 @@ int read_tree_at(struct repository *r,
 	struct tree_desc desc;
 	struct name_entry entry;
 	struct object_id oid;
-	int len, oldlen = base->len;
+	size_t len, oldlen = base->len;
 	enum interesting retval = entry_not_interesting;
 
 	if (depth > max_allowed_tree_depth)

unpack-trees.c

@@ -967,7 +967,7 @@ static int do_compare_entry_piecewise(const struct cache_entry *ce,
 				      const char *name, size_t namelen,
 				      unsigned mode)
 {
-	int pathlen, ce_len;
+	size_t pathlen, ce_len;
 	const char *ce_name;
 
 	if (info->prev) {
@@ -995,7 +995,7 @@ static int do_compare_entry(const struct cache_entry *ce,
 			    const char *name, size_t namelen,
 			    unsigned mode)
 {
-	int pathlen, ce_len;
+	size_t pathlen, ce_len;
 	const char *ce_name;
 	int cmp;
 	unsigned ce_mode;
@@ -1280,12 +1280,13 @@ static int find_cache_pos(struct traverse_info *info,
 	int pos;
 	struct unpack_trees_options *o = info->data;
 	struct index_state *index = o->src_index;
-	int pfxlen = info->pathlen;
+	size_t pfxlen = info->pathlen;
 
 	for (pos = o->internal.cache_bottom; pos < index->cache_nr; pos++) {
 		const struct cache_entry *ce = index->cache[pos];
 		const char *ce_name, *ce_slash;
-		int cmp, ce_len;
+		int cmp;
+		size_t ce_len;
 
 		if (ce->ce_flags & CE_UNPACKED) {
 			/*