kernel: syscalls: Whitespace fixups
The semi-automated API changes weren't checkpatch aware. Fix up
whitespace warnings that snuck into the previous patches. Really this
should be squashed, but that's somewhat difficult given the structure
of the series.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
diff --git a/drivers/hwinfo/hwinfo_handlers.c b/drivers/hwinfo/hwinfo_handlers.c
index 262626a..af8de70 100644
--- a/drivers/hwinfo/hwinfo_handlers.c
+++ b/drivers/hwinfo/hwinfo_handlers.c
@@ -7,7 +7,8 @@
#include <syscall_handler.h>
#include <drivers/hwinfo.h>
-ssize_t z_vrfy_hwinfo_get_device_id(u8_t *buffer, size_t length) {
+ssize_t z_vrfy_hwinfo_get_device_id(u8_t *buffer, size_t length)
+{
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buffer, length));
return z_impl_hwinfo_get_device_id((u8_t *)buffer, (size_t)length);
diff --git a/drivers/serial/uart_handlers.c b/drivers/serial/uart_handlers.c
index dd96c4b..7a0c511 100644
--- a/drivers/serial/uart_handlers.c
+++ b/drivers/serial/uart_handlers.c
@@ -8,13 +8,15 @@
#include <syscall_handler.h>
#define UART_SIMPLE(op_) \
- static inline int z_vrfy_uart_##op_(struct device *dev) { \
+ static inline int z_vrfy_uart_##op_(struct device *dev) \
+ { \
Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, op_)); \
return z_impl_uart_ ## op_(dev); \
}
#define UART_SIMPLE_VOID(op_) \
- static inline void z_vrfy_uart_##op_(struct device *dev) { \
+ static inline void z_vrfy_uart_##op_(struct device *dev) \
+ { \
Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, op_)); \
z_impl_uart_ ## op_(dev); \
}
diff --git a/include/syscall.h b/include/syscall.h
index 613c39c..cf12795 100644
--- a/include/syscall.h
+++ b/include/syscall.h
@@ -131,17 +131,17 @@
*/
static ALWAYS_INLINE bool z_syscall_trap(void)
{
- bool ret = false;
+ bool ret = false;
#ifdef CONFIG_USERSPACE
#if defined(__ZEPHYR_SUPERVISOR__)
- ret = false;
+ ret = false;
#elif defined(__ZEPHYR_USER__)
- ret = true;
+ ret = true;
#else
- ret = z_arch_is_user_context();
+ ret = z_arch_is_user_context();
#endif
#endif
- return ret;
+ return ret;
}
/**
diff --git a/kernel/atomic_c.c b/kernel/atomic_c.c
index 55cfb06..5f737d5 100644
--- a/kernel/atomic_c.c
+++ b/kernel/atomic_c.c
@@ -39,13 +39,16 @@
#include <syscall_handler.h>
#define ATOMIC_SYSCALL_HANDLER_TARGET(name) \
- static inline atomic_val_t z_vrfy_##name(atomic_t target) { \
+ static inline atomic_val_t z_vrfy_##name(atomic_t target) \
+ { \
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(target, sizeof(atomic_t))); \
return z_impl_##name((atomic_t *)target); \
}
#define ATOMIC_SYSCALL_HANDLER_TARGET_VALUE(name) \
- static inline atomic_val_t z_vrfy_##name(atomic_t target, u32_t value) { \
+ static inline atomic_val_t z_vrfy_##name(atomic_t target, \
+ u32_t value) \
+ { \
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(target, sizeof(atomic_t))); \
return z_impl_##name((atomic_t *)target, value); \
}
diff --git a/kernel/futex.c b/kernel/futex.c
index 0a3cd86..c26b188 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -89,7 +89,8 @@
return ret;
}
-static inline int z_vrfy_k_futex_wait(struct k_futex *futex, int expected, s32_t timeout)
+static inline int z_vrfy_k_futex_wait(struct k_futex *futex, int expected,
+ s32_t timeout)
{
if (Z_SYSCALL_MEMORY_WRITE(futex, sizeof(struct k_futex)) != 0) {
return -EACCES;
diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index 9bb2a59..069c95e 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c
@@ -173,7 +173,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline void z_vrfy_k_msgq_get_attrs(struct k_msgq *q, struct k_msgq_attrs *attrs)
+static inline void z_vrfy_k_msgq_get_attrs(struct k_msgq *q,
+ struct k_msgq_attrs *attrs)
{
Z_OOPS(Z_SYSCALL_OBJ(q, K_OBJ_MSGQ));
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(attrs, sizeof(struct k_msgq_attrs)));
diff --git a/kernel/poll.c b/kernel/poll.c
index b83e5a8..2441a77 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -259,7 +259,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_k_poll(struct k_poll_event *events, int num_events, s32_t timeout)
+static inline int z_vrfy_k_poll(struct k_poll_event *events,
+ int num_events, s32_t timeout)
{
int ret;
k_spinlock_key_t key;
@@ -438,7 +439,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *signal, int result)
+static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *signal,
+ int result)
{
Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL));
return z_impl_k_poll_signal_raise(signal, result);
diff --git a/kernel/queue.c b/kernel/queue.c
index 81b7ad4..2151327 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c
@@ -205,7 +205,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_queue_alloc_append(struct k_queue *queue, void *data)
+static inline s32_t z_vrfy_k_queue_alloc_append(struct k_queue *queue,
+ void *data)
{
Z_OOPS(Z_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_alloc_append(queue, data);
@@ -219,7 +220,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_queue_alloc_prepend(struct k_queue *queue, void *data)
+static inline s32_t z_vrfy_k_queue_alloc_prepend(struct k_queue *queue,
+ void *data)
{
Z_OOPS(Z_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_alloc_prepend(queue, data);
diff --git a/kernel/stack.c b/kernel/stack.c
index 12dc630..b7b25bc 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -71,7 +71,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_stack_alloc_init(struct k_stack *stack, u32_t num_entries)
+static inline s32_t z_vrfy_k_stack_alloc_init(struct k_stack *stack,
+ u32_t num_entries)
{
Z_OOPS(Z_SYSCALL_OBJ_NEVER_INIT(stack, K_OBJ_STACK));
Z_OOPS(Z_SYSCALL_VERIFY(num_entries > 0));
@@ -157,7 +158,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_k_stack_pop(struct k_stack *stack, stack_data_t *data, s32_t timeout)
+static inline int z_vrfy_k_stack_pop(struct k_stack *stack,
+ stack_data_t *data, s32_t timeout)
{
Z_OOPS(Z_SYSCALL_OBJ(stack, K_OBJ_STACK));
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(data, sizeof(stack_data_t)));
diff --git a/kernel/timer.c b/kernel/timer.c
index f81709d..972d971 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -122,7 +122,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline void z_vrfy_k_timer_start(struct k_timer *timer, s32_t duration, s32_t period)
+static inline void z_vrfy_k_timer_start(struct k_timer *timer,
+ s32_t duration, s32_t period)
{
Z_OOPS(Z_SYSCALL_VERIFY(duration >= 0 && period >= 0 &&
(duration != 0 || period != 0)));
@@ -231,7 +232,8 @@
}
#include <syscalls/k_timer_user_data_get_mrsh.c>
-static inline void z_vrfy_k_timer_user_data_set(struct k_timer *timer, void *user_data)
+static inline void z_vrfy_k_timer_user_data_set(struct k_timer *timer,
+ void *user_data)
{
Z_OOPS(Z_SYSCALL_OBJ(timer, K_OBJ_TIMER));
z_impl_k_timer_user_data_set(timer, user_data);
diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c
index bef6011..8d07e0e 100644
--- a/kernel/userspace_handler.c
+++ b/kernel/userspace_handler.c
@@ -36,7 +36,8 @@
* To avoid double z_object_find() lookups, we don't call the implementation
* function, but call a level deeper.
*/
-static inline void z_vrfy_k_object_access_grant(void *object, struct k_thread *thread)
+static inline void z_vrfy_k_object_access_grant(void *object,
+ struct k_thread *thread)
{
struct _k_object *ko;
diff --git a/lib/os/mutex.c b/lib/os/mutex.c
index 72ebd75..4f9811c 100644
--- a/lib/os/mutex.c
+++ b/lib/os/mutex.c
@@ -41,7 +41,8 @@
return k_mutex_lock(kernel_mutex, timeout);
}
-static inline int z_vrfy_z_sys_mutex_kernel_lock(struct sys_mutex *mutex, s32_t timeout)
+static inline int z_vrfy_z_sys_mutex_kernel_lock(struct sys_mutex *mutex,
+ s32_t timeout)
{
if (check_sys_mutex_addr((u32_t) mutex)) {
return -EACCES;
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 88817d0..14d7bcd 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -1148,7 +1148,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr)
+static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
+ const struct in6_addr *addr)
{
struct in6_addr addr_v6;
@@ -2801,7 +2802,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr)
+static inline int z_vrfy_net_if_ipv4_addr_lookup_by_index(
+ const struct in_addr *addr)
{
struct in_addr addr_v4;
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 48e83cc..b7bf1f9 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -307,7 +307,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
+static inline int z_vrfy_zsock_bind(int sock, const struct sockaddr *addr,
+ socklen_t addrlen)
{
struct sockaddr_storage dest_addr_copy;
@@ -441,7 +442,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
+static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr,
+ socklen_t *addrlen)
{
socklen_t addrlen_copy;
int ret;
@@ -557,7 +559,9 @@
}
#ifdef CONFIG_USERSPACE
-static inline ssize_t z_vrfy_zsock_sendmsg(int sock, const struct msghdr *msg, int flags)
+static inline ssize_t z_vrfy_zsock_sendmsg(int sock,
+ const struct msghdr *msg,
+ int flags)
{
/* TODO: Create a copy of msg_buf and copy the data there */
@@ -1090,7 +1094,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout)
+static inline int z_vrfy_zsock_poll(struct zsock_pollfd *fds,
+ int nfds, int timeout)
{
struct zsock_pollfd *fds_copy;
size_t fds_size;
@@ -1129,7 +1134,8 @@
}
#ifdef CONFIG_USERSPACE
-static inline int z_vrfy_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
+static inline int z_vrfy_zsock_inet_pton(sa_family_t family,
+ const char *src, void *dst)
{
int dst_size;
char src_copy[NET_IPV6_ADDR_LEN];
