reftable: remove unnecessary curly braces in reftable/pq.c
According to Documentation/CodingGuidelines, control-flow statements with a single line as their body must omit curly braces. Make reftable/pq.c conform to this guideline. Besides that, remove unnecessary newlines and variable assignment. 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
39bf06adf9
commit
f1b60b7c66
@ -27,22 +27,16 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
|
||||
pq->heap[0] = pq->heap[pq->len - 1];
|
||||
pq->len--;
|
||||
|
||||
i = 0;
|
||||
while (i < pq->len) {
|
||||
int min = i;
|
||||
int j = 2 * i + 1;
|
||||
int k = 2 * i + 2;
|
||||
if (j < pq->len && pq_less(&pq->heap[j], &pq->heap[i])) {
|
||||
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])) {
|
||||
if (k < pq->len && pq_less(&pq->heap[k], &pq->heap[min]))
|
||||
min = k;
|
||||
}
|
||||
|
||||
if (min == i) {
|
||||
if (min == i)
|
||||
break;
|
||||
}
|
||||
|
||||
SWAP(pq->heap[i], pq->heap[min]);
|
||||
i = min;
|
||||
}
|
||||
@ -60,12 +54,9 @@ void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry
|
||||
i = pq->len - 1;
|
||||
while (i > 0) {
|
||||
int j = (i - 1) / 2;
|
||||
if (pq_less(&pq->heap[j], &pq->heap[i])) {
|
||||
if (pq_less(&pq->heap[j], &pq->heap[i]))
|
||||
break;
|
||||
}
|
||||
|
||||
SWAP(pq->heap[j], pq->heap[i]);
|
||||
|
||||
i = j;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user