Clang-tidy fixes

13 files changed, 33 insertions, 45 deletions

diff --git a/lib/libc/sys/eventfd/eventfd_read.c b/lib/libc/sys/eventfd/eventfd_read.c
index 78d73623..a376489c 100644
--- a/lib/libc/sys/eventfd/eventfd_read.c
+++ b/lib/libc/sys/eventfd/eventfd_read.c
@@ -1,5 +1,4 @@
 #include <sys/eventfd.h>
-#include <syscall.h>
 #include <unistd.h>
 
 int eventfd_read(int fildes, eventfd_t *value)
diff --git a/lib/libc/sys/eventfd/eventfd_write.c b/lib/libc/sys/eventfd/eventfd_write.c
index 9c89b388..a9aa3e0b 100644
--- a/lib/libc/sys/eventfd/eventfd_write.c
+++ b/lib/libc/sys/eventfd/eventfd_write.c
@@ -1,5 +1,4 @@
 #include <sys/eventfd.h>
-#include <syscall.h>
 #include <unistd.h>
 
 int eventfd_write(int fildes, eventfd_t value)
diff --git a/lib/libc/sys/inotify/inotify_add_watch.c b/lib/libc/sys/inotify/inotify_add_watch.c
index 22ffd7b1..de2cd8ce 100644
--- a/lib/libc/sys/inotify/inotify_add_watch.c
+++ b/lib/libc/sys/inotify/inotify_add_watch.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <sys/inotify.h>
 #include <syscall.h>
 
diff --git a/lib/libc/sys/io_uring/io_uring_enter.c b/lib/libc/sys/io_uring/io_uring_enter.c
index 5fe0773d..da63ecd8 100644
--- a/lib/libc/sys/io_uring/io_uring_enter.c
+++ b/lib/libc/sys/io_uring/io_uring_enter.c
@@ -1,10 +1,9 @@
 #include <signal.h>
+#include <stddef.h>
 #include <syscall.h>
 
-int io_uring_enter(unsigned int fd, unsigned int to_submit,
-		   unsigned int min_complete, unsigned int flags, sigset_t *sig,
-		   size_t sz)
+int io_uring_enter(unsigned int fd, unsigned int to_submit, unsigned int min_complete, unsigned int flags,
+		   sigset_t *sig, size_t sz)
 {
-	return syscall(io_uring_enter, fd, to_submit, min_complete, flags, sig,
-		       sz);
+	return syscall(io_uring_enter, fd, to_submit, min_complete, flags, sig, sz);
 }
diff --git a/lib/libc/sys/io_uring/io_uring_register.c b/lib/libc/sys/io_uring/io_uring_register.c
index bee2355f..bbbcb9ee 100644
--- a/lib/libc/sys/io_uring/io_uring_register.c
+++ b/lib/libc/sys/io_uring/io_uring_register.c
@@ -1,7 +1,6 @@
 #include <syscall.h>
 
-int io_uring_register(unsigned int fd, unsigned int opcode, void *arg,
-		      unsigned int nr_args)
+int io_uring_register(unsigned int fd, unsigned int opcode, void *arg, unsigned int nr_args)
 {
 	return syscall(io_uring_register, fd, opcode, arg, nr_args);
 }
diff --git a/lib/libc/sys/io_uring/io_uring_setup.c b/lib/libc/sys/io_uring/io_uring_setup.c
index 0a368a81..916efc27 100644
--- a/lib/libc/sys/io_uring/io_uring_setup.c
+++ b/lib/libc/sys/io_uring/io_uring_setup.c
@@ -1,6 +1,8 @@
-#include <sys/eventfd.h>
+#include "linux/io_uring.h"
+#include "stddef.h"
 #include <io_uring.h>
 #include <string.h>
+#include <sys/eventfd.h>
 #include <sys/mman.h>
 #include <syscall.h>
 
@@ -21,12 +23,9 @@ int __io_uring_setup(void)
 	if (__io_uring.fd < 0)
 		return -1;
 
-	__io_uring.sq.ring_size =
-		p.sq_off.array + p.sq_entries * sizeof(unsigned int);
-	__io_uring.sq.ring = mmap(NULL, __io_uring.sq.ring_size,
-				  PROT_READ | PROT_WRITE,
-				  MAP_SHARED | MAP_POPULATE, __io_uring.fd,
-				  IORING_OFF_SQ_RING);
+	__io_uring.sq.ring_size = p.sq_off.array + p.sq_entries * sizeof(unsigned int);
+	__io_uring.sq.ring = mmap(NULL, __io_uring.sq.ring_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE,
+				  __io_uring.fd, IORING_OFF_SQ_RING);
 
 	if (__io_uring.sq.ring == MAP_FAILED)
 		return -1;
@@ -38,27 +37,21 @@ int __io_uring_setup(void)
 	__io_uring.sq.flags = __io_uring.sq.ring + p.sq_off.flags;
 	__io_uring.sq.dropped = __io_uring.sq.ring + p.sq_off.dropped;
 	__io_uring.sq.array = __io_uring.sq.ring + p.sq_off.array;
-	__io_uring.sq.sqes =
-		mmap(NULL, p.sq_entries * sizeof(struct io_uring_sqe),
-		     PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE,
-		     __io_uring.fd, IORING_OFF_SQES);
+	__io_uring.sq.sqes = mmap(NULL, p.sq_entries * sizeof(struct io_uring_sqe), PROT_READ | PROT_WRITE,
+				  MAP_SHARED | MAP_POPULATE, __io_uring.fd, IORING_OFF_SQES);
 
 	if (__io_uring.sq.sqes == MAP_FAILED) {
 		munmap(__io_uring.sq.ring, __io_uring.sq.ring_size);
 		return -1;
 	}
 
-	__io_uring.cq.ring_size =
-		p.cq_off.cqes + p.cq_entries * sizeof(struct io_uring_cqe);
-	__io_uring.cq.ring = mmap(NULL, __io_uring.cq.ring_size,
-				  PROT_READ | PROT_WRITE,
-				  MAP_SHARED | MAP_POPULATE, __io_uring.fd,
-				  IORING_OFF_CQ_RING);
+	__io_uring.cq.ring_size = p.cq_off.cqes + p.cq_entries * sizeof(struct io_uring_cqe);
+	__io_uring.cq.ring = mmap(NULL, __io_uring.cq.ring_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE,
+				  __io_uring.fd, IORING_OFF_CQ_RING);
 
 	if (__io_uring.cq.ring == MAP_FAILED) {
 		munmap(__io_uring.sq.ring, __io_uring.sq.ring_size);
-		munmap(__io_uring.sq.sqes,
-		       p.sq_entries * sizeof(struct io_uring_sqe));
+		munmap(__io_uring.sq.sqes, p.sq_entries * sizeof(struct io_uring_sqe));
 		return -1;
 	}
 
@@ -66,8 +59,7 @@ int __io_uring_setup(void)
 	if (__io_uring.eventfd < 0)
 		return -1;
 
-	io_uring_register(__io_uring.fd, IORING_REGISTER_EVENTFD,
-			  &__io_uring.eventfd, 1);
+	io_uring_register(__io_uring.fd, IORING_REGISTER_EVENTFD, &__io_uring.eventfd, 1);
 
 	__io_uring.cq.head = __io_uring.cq.ring + p.cq_off.head;
 	__io_uring.cq.tail = __io_uring.cq.ring + p.cq_off.tail;
diff --git a/lib/libc/sys/mount.c b/lib/libc/sys/mount.c
index 75532cdf..6cd77f1b 100644
--- a/lib/libc/sys/mount.c
+++ b/lib/libc/sys/mount.c
@@ -2,8 +2,8 @@
 #include <sys/mount.h> // for mount
 #include <syscall.h>   // for __syscall_5, syscall
 
-int mount(const char *source, const char *target, const char *filesystemtype,
-	  unsigned long mountflags, const void *_Nullable data)
+int mount(const char *source, const char *target, const char *filesystemtype, unsigned long mountflags,
+	  const void *_Nullable data)
 {
 	return syscall(mount, source, target, filesystemtype, mountflags, data);
 }
diff --git a/lib/libc/sys/mqueue/mq_getattr.c b/lib/libc/sys/mqueue/mq_getattr.c
index f5ca62de..2087a5b9 100644
--- a/lib/libc/sys/mqueue/mq_getattr.c
+++ b/lib/libc/sys/mqueue/mq_getattr.c
@@ -1,5 +1,4 @@
 #include <mqueue.h>
-#include <syscall.h>
 
 int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat)
 {
diff --git a/lib/libc/sys/mqueue/mq_notify.c b/lib/libc/sys/mqueue/mq_notify.c
index 6011f567..0652da12 100644
--- a/lib/libc/sys/mqueue/mq_notify.c
+++ b/lib/libc/sys/mqueue/mq_notify.c
@@ -1,3 +1,4 @@
+#include "stddef.h"
 #include <errno.h>
 #include <mqueue.h>
 #include <signal.h>
diff --git a/lib/libc/sys/mqueue/mq_receive.c b/lib/libc/sys/mqueue/mq_receive.c
index 98d3cd9e..a33ef0ae 100644
--- a/lib/libc/sys/mqueue/mq_receive.c
+++ b/lib/libc/sys/mqueue/mq_receive.c
@@ -1,7 +1,7 @@
 #include <mqueue.h>
+#include <stddef.h>
 
-ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
-		   unsigned *msg_prio)
+ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio)
 {
 	return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, 0);
 }
diff --git a/lib/libc/sys/mqueue/mq_setattr.c b/lib/libc/sys/mqueue/mq_setattr.c
index be2a3b3d..a1bde88b 100644
--- a/lib/libc/sys/mqueue/mq_setattr.c
+++ b/lib/libc/sys/mqueue/mq_setattr.c
@@ -1,8 +1,7 @@
 #include <mqueue.h>
 #include <syscall.h>
 
-int mq_setattr(mqd_t mqdes, const struct mq_attr *restrict mqstat,
-	       struct mq_attr *restrict omqstat)
+int mq_setattr(mqd_t mqdes, const struct mq_attr *restrict mqstat, struct mq_attr *restrict omqstat)
 {
 	return syscall(mq_getsetattr, mqdes, mqstat, omqstat);
 }
diff --git a/lib/libc/sys/mqueue/mq_timedreceive.c b/lib/libc/sys/mqueue/mq_timedreceive.c
index bf877fa5..53328862 100644
--- a/lib/libc/sys/mqueue/mq_timedreceive.c
+++ b/lib/libc/sys/mqueue/mq_timedreceive.c
@@ -1,10 +1,10 @@
 #include <mqueue.h>
+#include <stddef.h>
 #include <syscall.h>
+#include <time.h>
 
-ssize_t mq_timedreceive(mqd_t mqdes, char *restrict msg_ptr, size_t msg_len,
-			unsigned *restrict msg_prio,
+ssize_t mq_timedreceive(mqd_t mqdes, char *restrict msg_ptr, size_t msg_len, unsigned *restrict msg_prio,
 			const struct timespec *restrict abstime)
 {
-	return syscall(mq_timedreceive, mqdes, msg_ptr, msg_len, msg_prio,
-		       abstime);
+	return syscall(mq_timedreceive, mqdes, msg_ptr, msg_len, msg_prio, abstime);
 }
diff --git a/lib/libc/sys/mqueue/mq_timedsend.c b/lib/libc/sys/mqueue/mq_timedsend.c
index 228a5d06..3f533095 100644
--- a/lib/libc/sys/mqueue/mq_timedsend.c
+++ b/lib/libc/sys/mqueue/mq_timedsend.c
@@ -1,9 +1,9 @@
 #include <mqueue.h>
+#include <stddef.h>
 #include <syscall.h>
+#include <time.h>
 
-int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
-		 unsigned msg_prio, const struct timespec *abstime)
+int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec *abstime)
 {
-	return syscall(mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio,
-		       abstime);
+	return syscall(mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, abstime);
 }