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

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2023-06-13 13:15:05 +01:00
parent 581eebb197 10fa67fdaa
commit e9608c9d05
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os2/file_windows.odin
+1 -1
View File
@@ -287,7 +287,7 @@ _read :: proc(f: ^File, p: []byte) -> (n: int, err: Error) {
} }
} }
return int(total_read), nil return int(total_read), err
} }
_read_at :: proc(f: ^File, p: []byte, offset: i64) -> (n: int, err: Error) { _read_at :: proc(f: ^File, p: []byte, offset: i64) -> (n: int, err: Error) {
core/os/os_darwin.odin
+7 -7
View File
@@ -440,7 +440,7 @@ foreign libc {
@(link_name="closedir") _unix_closedir :: proc(dirp: Dir) -> c.int --- @(link_name="closedir") _unix_closedir :: proc(dirp: Dir) -> c.int ---
@(link_name="rewinddir") _unix_rewinddir :: proc(dirp: Dir) --- @(link_name="rewinddir") _unix_rewinddir :: proc(dirp: Dir) ---
@(link_name="__fcntl") _unix__fcntl :: proc(fd: Handle, cmd: c.int, #c_vararg args: ..any) -> c.int --- @(link_name="__fcntl") _unix__fcntl :: proc(fd: Handle, cmd: c.int, arg: uintptr) -> c.int ---
@(link_name="rename") _unix_rename :: proc(old: cstring, new: cstring) -> c.int --- @(link_name="rename") _unix_rename :: proc(old: cstring, new: cstring) -> c.int ---
@(link_name="remove") _unix_remove :: proc(path: cstring) -> c.int --- @(link_name="remove") _unix_remove :: proc(path: cstring) -> c.int ---
@@ -794,14 +794,14 @@ _readlink :: proc(path: string) -> (string, Errno) {
} }
absolute_path_from_handle :: proc(fd: Handle) -> (string, Errno) { absolute_path_from_handle :: proc(fd: Handle) -> (string, Errno) {
buf : [256]byte buf: [DARWIN_MAXPATHLEN]byte
res := _unix__fcntl(fd, F_GETPATH, &buf[0]) _, err := fcntl(int(fd), F_GETPATH, int(uintptr(&buf[0])))
if res != 0 { if err != ERROR_NONE {
return "", Errno(get_last_error()) return "", err
} }
path := strings.clone_from_cstring(cstring(&buf[0])) path := strings.clone_from_cstring(cstring(&buf[0]))
return path, ERROR_NONE return path, err
} }
absolute_path_from_relative :: proc(rel: string) -> (path: string, err: Errno) { absolute_path_from_relative :: proc(rel: string) -> (path: string, err: Errno) {
@@ -1068,7 +1068,7 @@ shutdown :: proc(sd: Socket, how: int) -> (Errno) {
} }
fcntl :: proc(fd: int, cmd: int, arg: int) -> (int, Errno) { fcntl :: proc(fd: int, cmd: int, arg: int) -> (int, Errno) {
result := _unix__fcntl(Handle(fd), c.int(cmd), c.int(arg)) result := _unix__fcntl(Handle(fd), c.int(cmd), uintptr(arg))
if result < 0 { if result < 0 {
return 0, Errno(get_last_error()) return 0, Errno(get_last_error())
} }