reftable: change the type of array indices to 'size_t' in reftable/pq.c
The variables 'i', 'j', 'k' and 'min' are used as indices for 'pq->heap', which is an array. Additionally, 'pq->len' is of type 'size_t' and is often used to assign values to these variables. Hence, change the type of these variables from 'int' to 'size_t'. Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
f1b60b7c66
commit
2a85906348
@ -22,15 +22,15 @@ int pq_less(struct pq_entry *a, struct pq_entry *b)
|
||||
|
||||
struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
|
||||
{
|
||||
int i = 0;
|
||||
size_t i = 0;
|
||||
struct pq_entry e = pq->heap[0];
|
||||
pq->heap[0] = pq->heap[pq->len - 1];
|
||||
pq->len--;
|
||||
|
||||
while (i < pq->len) {
|
||||
int min = i;
|
||||
int j = 2 * i + 1;
|
||||
int k = 2 * i + 2;
|
||||
size_t min = i;
|
||||
size_t j = 2 * i + 1;
|
||||
size_t k = 2 * i + 2;
|
||||
if (j < pq->len && pq_less(&pq->heap[j], &pq->heap[i]))
|
||||
min = j;
|
||||
if (k < pq->len && pq_less(&pq->heap[k], &pq->heap[min]))
|
||||
@ -46,14 +46,14 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
|
||||
|
||||
void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e)
|
||||
{
|
||||
int i = 0;
|
||||
size_t i = 0;
|
||||
|
||||
REFTABLE_ALLOC_GROW(pq->heap, pq->len + 1, pq->cap);
|
||||
pq->heap[pq->len++] = *e;
|
||||
|
||||
i = pq->len - 1;
|
||||
while (i > 0) {
|
||||
int j = (i - 1) / 2;
|
||||
size_t j = (i - 1) / 2;
|
||||
if (pq_less(&pq->heap[j], &pq->heap[i]))
|
||||
break;
|
||||
SWAP(pq->heap[j], pq->heap[i]);
|
||||
|
Reference in New Issue
Block a user