From eccce5253b9bfb17238f7d94c9ccf1cfd935eeb2 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 30 Mar 2020 10:03:20 -0400 Subject: oid_array: use size_t for iteration The previous commit started using size_t for our allocations. There are some iterations that use int or unsigned, though. These aren't dangerous with respect to memory, but they could produce incorrect results. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano diff --git a/sha1-array.c b/sha1-array.c index 3eeadfe..bada0c4 100644 --- a/sha1-array.c +++ b/sha1-array.c @@ -46,7 +46,7 @@ int oid_array_for_each(struct oid_array *array, for_each_oid_fn fn, void *data) { - int i; + size_t i; /* No oid_array_sort() here! See sha1-array.h */ @@ -62,7 +62,7 @@ int oid_array_for_each_unique(struct oid_array *array, for_each_oid_fn fn, void *data) { - int i; + size_t i; if (!array->sorted) oid_array_sort(array); @@ -82,7 +82,7 @@ void oid_array_filter(struct oid_array *array, for_each_oid_fn want, void *cb_data) { - unsigned nr = array->nr, src, dst; + size_t nr = array->nr, src, dst; struct object_id *oids = array->oid; for (src = dst = 0; src < nr; src++) { -- cgit v0.10.2-6-g49f6