diff options
| author | Kinsey Moore <kinsey.moore@oarcorp.com> | 2023-01-26 12:18:44 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2023-01-30 10:44:24 -0600 |
| commit | 4c0a2d47e1dce0923f270d0206d0cb93d0d58451 (patch) | |
| tree | 290fdc5e9efd77dc9427481744f0a681e8731695 /cpukit/dev | |
| parent | grlib: Fix snprintf() overflow warnings from gcc 12 (diff) | |
| download | rtems-4c0a2d47e1dce0923f270d0206d0cb93d0d58451.tar.bz2 | |
cpukit/dev/can: Resolve warnings in 64bit builds
This resolves various gcc warnings in AArch64 LP64 builds of the CAN
framework.
Diffstat (limited to 'cpukit/dev')
| -rw-r--r-- | cpukit/dev/can/can.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpukit/dev/can/can.c b/cpukit/dev/can/can.c index 2e6d5df65b..9f3fe0db98 100644 --- a/cpukit/dev/can/can.c +++ b/cpukit/dev/can/can.c @@ -34,6 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <inttypes.h> #include <string.h> #include <stdlib.h> @@ -57,13 +58,13 @@ real_can_interrupt_lock_release(bus); \ } while (0); -static ssize_t +static int can_bus_open(rtems_libio_t *iop, const char *path, int oflag, mode_t mode); static ssize_t can_bus_read(rtems_libio_t *iop, void *buffer, size_t count); static ssize_t can_bus_write(rtems_libio_t *iop, const void *buffer, size_t count); -static ssize_t +static int can_bus_ioctl(rtems_libio_t *iop, ioctl_command_t request, void *buffer); static int can_xmit(struct can_bus *bus); @@ -179,7 +180,7 @@ static int try_sem(struct can_bus *bus) return ret; } -static ssize_t +static int can_bus_open(rtems_libio_t *iop, const char *path, int oflag, mode_t mode) { CAN_DEBUG("can_bus_open\n"); @@ -210,7 +211,8 @@ static ssize_t can_bus_read(rtems_libio_t *iop, void *buffer, size_t count) len = CAN_MSG_LEN(&bus->can_rx_msg); if (count < len) { - CAN_DEBUG("can_bus_read: buffer size is small min sizeof(struct can_msg) = %u\n", + CAN_DEBUG("can_bus_read: buffer size is small min " + "sizeof(struct can_msg) = %" PRIuPTR "\n", sizeof(struct can_msg)); return -RTEMS_INVALID_SIZE; } @@ -314,8 +316,8 @@ can_bus_write(rtems_libio_t *iop, const void *buffer, size_t count) CAN_DEBUG_TX("can_bus_write: can_msg_size = %u\n", msg_size); if (msg_size > sizeof(struct can_msg)) { - CAN_ERR("can_bus_write:" - "can message len error msg_size = %u struct can_msg = %u\n", + CAN_ERR("can_bus_write: can message " + "len error msg_size = %u struct can_msg = %" PRIxPTR "\n", msg_size, sizeof(struct can_msg)); return -RTEMS_INVALID_SIZE; } @@ -363,7 +365,7 @@ release_lock_and_return: return ret; } -static ssize_t +static int can_bus_ioctl(rtems_libio_t *iop, ioctl_command_t request, void *buffer) { can_bus *bus = IMFS_generic_get_context_by_iop(iop); |