summaryrefslogtreecommitdiff
path: root/firmware/kernel/queue.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-01-16 00:10:38 +0100
committerGerrit Rockbox <gerrit@rockbox.org>2017-02-04 17:24:47 +0100
commitd7871914acd2ed77f43344e36e08944524a67d9e (patch)
tree7bcef243d9b53c3703c305b8a5f9f8a8488eabfb /firmware/kernel/queue.c
parent1245c5fe61f6ca8e1980a33a8b8f7ea4322829fd (diff)
downloadrockbox-d7871914acd2ed77f43344e36e08944524a67d9e.tar.gz
rockbox-d7871914acd2ed77f43344e36e08944524a67d9e.zip
Fix dangerous casts
On Windows 64-bit, the size of long is 32-bit, thus any pointer to long cast is not valid. In any case, one should use intptr_t and ptrdiff_t when casting to integers. This commit attempts to fix all instances reported by GCC. When relevant, I replaced code by the macros PTR_ADD, ALIGN_UP from system.h Change-Id: I2273b0e8465d3c4689824717ed5afa5ed238a2dc
Diffstat (limited to 'firmware/kernel/queue.c')
-rw-r--r--firmware/kernel/queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/kernel/queue.c b/firmware/kernel/queue.c
index 233b53c364..5566604c5d 100644
--- a/firmware/kernel/queue.c
+++ b/firmware/kernel/queue.c
@@ -418,7 +418,7 @@ void queue_post(struct event_queue *q, long id, intptr_t data)
418 wr = q->write++ & QUEUE_LENGTH_MASK; 418 wr = q->write++ & QUEUE_LENGTH_MASK;
419 419
420 KERNEL_ASSERT((q->write - q->read) <= QUEUE_LENGTH, 420 KERNEL_ASSERT((q->write - q->read) <= QUEUE_LENGTH,
421 "queue_post ovf q=%08lX", (long)q); 421 "queue_post ovf q=%p", q);
422 422
423 q->events[wr].id = id; 423 q->events[wr].id = id;
424 q->events[wr].data = data; 424 q->events[wr].data = data;
@@ -450,7 +450,7 @@ intptr_t queue_send(struct event_queue *q, long id, intptr_t data)
450 wr = q->write++ & QUEUE_LENGTH_MASK; 450 wr = q->write++ & QUEUE_LENGTH_MASK;
451 451
452 KERNEL_ASSERT((q->write - q->read) <= QUEUE_LENGTH, 452 KERNEL_ASSERT((q->write - q->read) <= QUEUE_LENGTH,
453 "queue_send ovf q=%08lX", (long)q); 453 "queue_send ovf q=%p", q);
454 454
455 q->events[wr].id = id; 455 q->events[wr].id = id;
456 q->events[wr].data = data; 456 q->events[wr].data = data;