From 2ab8b7aafeedf23aef50e84f43fe796cb6bc1341 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 2 Mar 2025 18:03:18 +0100 Subject: [PATCH] kern: Fix many V warnings --- kernel/modules/acpi/madt.v | 2 +- kernel/modules/fs/vfs.v | 2 +- kernel/modules/socket/socket.v | 24 ++++++++++++------------ kernel/modules/socket/unix/unix.v | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kernel/modules/acpi/madt.v b/kernel/modules/acpi/madt.v index 75c60b675..25219b72c 100644 --- a/kernel/modules/acpi/madt.v +++ b/kernel/modules/acpi/madt.v @@ -78,7 +78,7 @@ __global ( ) fn madt_init() { - madt := unsafe { &MADT(find_sdt('APIC', 0) or { panic('System does not have a MADT') }) } + madt = unsafe { &MADT(find_sdt('APIC', 0) or { panic('System does not have a MADT') }) } mut current := u64(0) diff --git a/kernel/modules/fs/vfs.v b/kernel/modules/fs/vfs.v index e866c1f13..c673dca94 100644 --- a/kernel/modules/fs/vfs.v +++ b/kernel/modules/fs/vfs.v @@ -148,7 +148,7 @@ fn path2node(parent &VFSNode, path string) (&VFSNode, &VFSNode, string) { return 0, 0, '' } - new_node := reduce_node(unsafe { current_node.children[elem_str] }, false) + mut new_node := reduce_node(unsafe { current_node.children[elem_str] }, false) if last == true { return current_node, new_node, elem_str diff --git a/kernel/modules/socket/socket.v b/kernel/modules/socket/socket.v index 7e1a2e4be..703009e69 100644 --- a/kernel/modules/socket/socket.v +++ b/kernel/modules/socket/socket.v @@ -116,11 +116,11 @@ pub fn syscall_accept(_ voidptr, fdnum int) (u64, u64) { fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval @@ -149,11 +149,11 @@ pub fn syscall_bind(_ voidptr, fdnum int, _addr voidptr, addrlen u32) (u64, u64) fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval @@ -178,11 +178,11 @@ pub fn syscall_listen(_ voidptr, fdnum int, backlog int) (u64, u64) { fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval @@ -208,11 +208,11 @@ pub fn syscall_recvmsg(_ voidptr, fdnum int, msg &sock_pub.MsgHdr, flags int) (u fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval @@ -238,11 +238,11 @@ pub fn syscall_connect(_ voidptr, fdnum int, _addr voidptr, addrlen u32) (u64, u fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval @@ -268,11 +268,11 @@ pub fn syscall_getpeername(_ voidptr, fdnum int, _addr voidptr, addrlen &u32) (u fd.unref() } - res := fd.handle.resource + mut res := fd.handle.resource mut sock := &sock_pub.Socket(unsafe { nil }) - if res is sock_unix.UnixSocket { + if mut res is sock_unix.UnixSocket { sock = res } else { return errno.err, errno.einval diff --git a/kernel/modules/socket/unix/unix.v b/kernel/modules/socket/unix/unix.v index aee552e1b..aca019f5b 100644 --- a/kernel/modules/socket/unix/unix.v +++ b/kernel/modules/socket/unix/unix.v @@ -316,11 +316,11 @@ fn (mut this UnixSocket) connect(handle voidptr, _addr voidptr, addrlen u32) ? { mut target := fs.get_node(t.process.current_directory, path, true) or { return none } - target_res := target.resource + mut target_res := target.resource mut socket := &UnixSocket(unsafe { nil }) - if target_res is UnixSocket { + if mut target_res is UnixSocket { socket = target_res } else { errno.set(errno.einval)