[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 23/29] device/kmsg.c (kmsgread, kmsg_read_done): cast arguments t
From: |
Marin Ramesa |
Subject: |
[PATCH 23/29] device/kmsg.c (kmsgread, kmsg_read_done): cast arguments to memcpy() |
Date: |
Mon, 9 Dec 2013 23:57:38 +0100 |
* device/kmsg.c (kmsgread, kmsg_read_done) (memcpy) (io_data): Cast to (void *).
(kmsgread, kmsg_read_done) (memcpy) (kmsg_buffer + kmsg_read_offset): Likewise.
(kmsgread, kmsg_read_done) (memcpy) (amt): Cast to size_t.
(kmsgread, kmsg_read_done) (memcpy) (cnt): Likewise.
(kmsgread, kmsg_read_done) (memcpy) (io_data + cnt): Cast to (void *).
(kmsgread, kmsg_read_done) (memcpy) (kmsg_buffer): Likewise.
(kmsgread, kmsg_read_done) (memcpy) (amt - cnt): Cast to size_t.
---
device/kmsg.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/device/kmsg.c b/device/kmsg.c
index d2710a3..f6a21da 100644
--- a/device/kmsg.c
+++ b/device/kmsg.c
@@ -129,15 +129,15 @@ kmsgread (dev_t dev, io_req_t ior)
if (kmsg_read_offset + amt <= KMSGBUFSIZE)
{
- memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, amt);
+ memcpy ((void *)ior->io_data, (void *)(kmsg_buffer + kmsg_read_offset),
(size_t)amt);
}
else
{
int cnt;
cnt = KMSGBUFSIZE - kmsg_read_offset;
- memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, cnt);
- memcpy (ior->io_data + cnt, kmsg_buffer, amt - cnt);
+ memcpy ((void *)ior->io_data, (void *)(kmsg_buffer + kmsg_read_offset),
(size_t)cnt);
+ memcpy ((void *)(ior->io_data + cnt), (void *)kmsg_buffer, (size_t)(amt
- cnt));
}
kmsg_read_offset += amt;
@@ -175,15 +175,15 @@ kmsg_read_done (io_req_t ior)
if (kmsg_read_offset + amt <= KMSGBUFSIZE)
{
- memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, amt);
+ memcpy ((void *)ior->io_data, (void *)(kmsg_buffer + kmsg_read_offset),
(size_t)amt);
}
else
{
int cnt;
cnt = KMSGBUFSIZE - kmsg_read_offset;
- memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, cnt);
- memcpy (ior->io_data + cnt, kmsg_buffer, amt - cnt);
+ memcpy ((void *)ior->io_data, (void *)(kmsg_buffer + kmsg_read_offset),
(size_t)cnt);
+ memcpy ((void *)(ior->io_data + cnt), (void *)kmsg_buffer, (size_t)(amt
- cnt));
}
kmsg_read_offset += amt;
--
1.8.1.4
- [PATCH 15/29] device/dev_pager.c (device_pager_data_request_done): check if io_count is larger or equal to zero and cast it to vm_size_t, (continued)
- [PATCH 15/29] device/dev_pager.c (device_pager_data_request_done): check if io_count is larger or equal to zero and cast it to vm_size_t, Marin Ramesa, 2013/12/09
- [PATCH 16/29] device/dev_pager.c (device_pager_data_request_done): check if io_residual is larger or equal to zero and cast it to size_t, Marin Ramesa, 2013/12/09
- [PATCH 17/29] device/dev_pager.c (device_pager_data_request_done): remove unnecessary cast, Marin Ramesa, 2013/12/09
- [PATCH 18/29] device/dev_pager.c: remove forward declaration, Marin Ramesa, 2013/12/09
- [PATCH 19/29] device/dev_pager.c: remove forward declarations, Marin Ramesa, 2013/12/09
- [PATCH 20/29] device/ds_routines.c: remove forward declaration, Marin Ramesa, 2013/12/09
- [PATCH 21/29] device/ds_routines.c (device_write_get): check if io_count is larger or equal to zero and cast it to size_t, Marin Ramesa, 2013/12/09
- [PATCH 22/29] device/kmsg.c (kmsgread): check if io_count is larger or equal to zero and cast it to vm_size_t, Marin Ramesa, 2013/12/09
- [PATCH 23/29] device/kmsg.c (kmsgread, kmsg_read_done): cast arguments to memcpy(),
Marin Ramesa <=
- [PATCH 24/29] device/kmsg.c (kmsg_read_done): check if amt is negative, Marin Ramesa, 2013/12/09
- [PATCH 25/29] device/net_io.c: remove forward declarations, Marin Ramesa, 2013/12/09
- [PATCH 26/29] device/net_io.c (net_getstat): check if addr_byte_count is negative, Marin Ramesa, 2013/12/09
- [PATCH 27/29] device/net_io.c (net_getstat): cast arguments to memcpy(), Marin Ramesa, 2013/12/09
- [PATCH 28/29] device/net_io.c (net_getstat): cast arguments to memset(), Marin Ramesa, 2013/12/09
- [PATCH 29/29] device/subrs.c: use io_req_t instead of struct buf, Marin Ramesa, 2013/12/09