ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor clean ups

Browse Source
This commit is contained in:
gingerBill
2024-07-19 12:00:49 +01:00
parent 2f8399fe20
commit 393ca40c23
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sys/linux/helpers.odin
+31 -28
View File
@@ -12,7 +12,7 @@ import "base:intrinsics"
@(private) @(private)
syscall0 :: #force_inline proc "contextless" (nr: uintptr) -> int { syscall0 :: #force_inline proc "contextless" (nr: uintptr) -> int {
return cast(int) intrinsics.syscall(nr) return int(intrinsics.syscall(nr))
} }
@(private) @(private)
@@ -20,7 +20,7 @@ syscall1 :: #force_inline proc "contextless" (nr: uintptr, p1: $T) -> int
where where
size_of(p1) <= size_of(uintptr) size_of(p1) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, cast(uintptr) p1) return int(intrinsics.syscall(nr, uintptr(p1)))
} }
@(private) @(private)
@@ -29,8 +29,7 @@ where
size_of(p1) <= size_of(uintptr), size_of(p1) <= size_of(uintptr),
size_of(p2) <= size_of(uintptr) size_of(p2) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, return int(intrinsics.syscall(nr, uintptr(p1), uintptr(p2)))
cast(uintptr) p1, cast(uintptr) p2)
} }
@(private) @(private)
@@ -40,10 +39,11 @@ where
size_of(p2) <= size_of(uintptr), size_of(p2) <= size_of(uintptr),
size_of(p3) <= size_of(uintptr) size_of(p3) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, return int(intrinsics.syscall(nr,
cast(uintptr) p1, uintptr(p1),
cast(uintptr) p2, uintptr(p2),
cast(uintptr) p3) uintptr(p3),
))
} }
@(private) @(private)
@@ -54,11 +54,12 @@ where
size_of(p3) <= size_of(uintptr), size_of(p3) <= size_of(uintptr),
size_of(p4) <= size_of(uintptr) size_of(p4) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, return int(intrinsics.syscall(nr,
cast(uintptr) p1, uintptr(p1),
cast(uintptr) p2, uintptr(p2),
cast(uintptr) p3, uintptr(p3),
cast(uintptr) p4) uintptr(p4),
))
} }
@(private) @(private)
@@ -70,12 +71,13 @@ where
size_of(p4) <= size_of(uintptr), size_of(p4) <= size_of(uintptr),
size_of(p5) <= size_of(uintptr) size_of(p5) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, return int(intrinsics.syscall(nr,
cast(uintptr) p1, uintptr(p1),
cast(uintptr) p2, uintptr(p2),
cast(uintptr) p3, uintptr(p3),
cast(uintptr) p4, uintptr(p4),
cast(uintptr) p5) uintptr(p5),
))
} }
@(private) @(private)
@@ -88,13 +90,14 @@ where
size_of(p5) <= size_of(uintptr), size_of(p5) <= size_of(uintptr),
size_of(p6) <= size_of(uintptr) size_of(p6) <= size_of(uintptr)
{ {
return cast(int) intrinsics.syscall(nr, return int(intrinsics.syscall(nr,
cast(uintptr) p1, uintptr(p1),
cast(uintptr) p2, uintptr(p2),
cast(uintptr) p3, uintptr(p3),
cast(uintptr) p4, uintptr(p4),
cast(uintptr) p5, uintptr(p5),
cast(uintptr) p6) uintptr(p6),
))
} }
syscall :: proc {syscall0, syscall1, syscall2, syscall3, syscall4, syscall5, syscall6} syscall :: proc {syscall0, syscall1, syscall2, syscall3, syscall4, syscall5, syscall6}
@@ -113,7 +116,7 @@ where
default_value: T default_value: T
return default_value, Errno(-ret) return default_value, Errno(-ret)
} else { } else {
return cast(T) transmute(U) ret, Errno(.NONE) return T(transmute(U)ret), Errno(.NONE)
} }
} }
@@ -123,7 +126,7 @@ errno_unwrap2 :: #force_inline proc "contextless" (ret: $P, $T: typeid) -> (T, E
default_value: T default_value: T
return default_value, Errno(-ret) return default_value, Errno(-ret)
} else { } else {
return cast(T) ret, Errno(.NONE) return T(ret), Errno(.NONE)
} }
} }
core/sys/linux/types.odin
+1 -1
View File
@@ -688,7 +688,7 @@ Sock_Addr_In6 :: struct #packed {
} }
/* /*
Struct representing Unix Domain Socket address Struct representing Unix Domain Socket address
*/ */
Sock_Addr_Un :: struct #packed { Sock_Addr_Un :: struct #packed {
sun_family: Address_Family, sun_family: Address_Family,