| Message ID | 20241227-b4-pks-commit-reach-sign-compare-v1-1-07c59c2aa632@pks.im (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | commit-reach: -Wsign-compare follow-ups | expand |
On Fri, Dec 27, 2024 at 11:46:21AM +0100, Patrick Steinhardt wrote: > In 62e745ced2 (prio-queue: use size_t rather than int for size, > 2024-12-20), we have converted `struct prio_queue` to use `size_t` to > track the number of entries in the queue as well as the allocated size > of the underlying array. There is one more counter though, namely the > insertion counter, that is still using an `unsigned` instead of a > `size_t`. This is unlikely to ever be a problem, but it makes one wonder > why some indices use `size_t` while others use `unsigned`. Furthermore, > the mentioned commit stated the intent to also adapt these variables, > but seemingly forgot to do so. > > Fix the issue by converting those counters to use `size_t`, as well. Yep, this looks good, and was what I meant to send in 62e745ced2. -Peff
diff --git a/prio-queue.h b/prio-queue.h index 36f370625f0802cb84082fea904ad6e8a456520a..38d032636d4cf9c544811cff6c3e6a080d6c7b82 100644 --- a/prio-queue.h +++ b/prio-queue.h @@ -22,13 +22,13 @@ typedef int (*prio_queue_compare_fn)(const void *one, const void *two, void *cb_data); struct prio_queue_entry { - unsigned ctr; + size_t ctr; void *data; }; struct prio_queue { prio_queue_compare_fn compare; - unsigned insertion_ctr; + size_t insertion_ctr; void *cb_data; size_t alloc, nr; struct prio_queue_entry *array;
In 62e745ced2 (prio-queue: use size_t rather than int for size, 2024-12-20), we have converted `struct prio_queue` to use `size_t` to track the number of entries in the queue as well as the allocated size of the underlying array. There is one more counter though, namely the insertion counter, that is still using an `unsigned` instead of a `size_t`. This is unlikely to ever be a problem, but it makes one wonder why some indices use `size_t` while others use `unsigned`. Furthermore, the mentioned commit stated the intent to also adapt these variables, but seemingly forgot to do so. Fix the issue by converting those counters to use `size_t`, as well. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- prio-queue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)