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

Fix copy-replace errors

Browse Source
This commit is contained in:
gingerBill
2024-08-04 11:10:17 +01:00
parent 9f9abb8fb3
commit 1826b0c700
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os2/errors.odin
+4 -4
View File
@@ -3,7 +3,7 @@ package os2
import "core:io" import "core:io"
import "base:runtime" import "base:runtime"
General_Platform_Error :: enum u32 { General_Error :: enum u32 {
None, None,
Permission_Denied, Permission_Denied,
@@ -29,7 +29,7 @@ General_Platform_Error :: enum u32 {
Unsupported, Unsupported,
} }
Platform_Platform_Error :: enum i32 {None=0} Platform_Error :: enum i32 {None=0}
Error :: union #shared_nil { Error :: union #shared_nil {
General_Error, General_Error,
@@ -43,7 +43,7 @@ ERROR_NONE :: Error{}
is_platform_Platform_Error :: proc(ferr: Error) -> (err: i32, ok: bool) { is_platform_error :: proc(ferr: Error) -> (err: i32, ok: bool) {
v := ferr.(Platform_Error) or_else {} v := ferr.(Platform_Error) or_else {}
return i32(v), i32(v) != 0 return i32(v), i32(v) != 0
} }
@@ -104,7 +104,7 @@ error_string :: proc(ferr: Error) -> string {
return "unknown error" return "unknown error"
} }
print_Platform_Error :: proc(f: ^File, ferr: Error, msg: string) { print_error :: proc(f: ^File, ferr: Error, msg: string) {
TEMP_ALLOCATOR_GUARD() TEMP_ALLOCATOR_GUARD()
err_str := error_string(ferr) err_str := error_string(ferr)
core/os/os2/errors_linux.odin
+1 -1
View File
@@ -142,7 +142,7 @@ _errno_strings : [linux.Errno]string = {
} }
_get_platform_Platform_Error :: proc(errno: linux.Errno) -> Error { _get_platform_error :: proc(errno: linux.Errno) -> Error {
#partial switch errno { #partial switch errno {
case .NONE: case .NONE:
return nil return nil
core/os/os2/errors_windows.odin
+1 -1
View File
@@ -20,7 +20,7 @@ _error_string :: proc(errno: i32) -> string {
return "<unknown platform error>" return "<unknown platform error>"
} }
_get_platform_Platform_Error :: proc() -> Error { _get_platform_error :: proc() -> Error {
err := win32.GetLastError() err := win32.GetLastError()
if err == 0 { if err == 0 {
return nil return nil
core/os/os2/file_stream.odin
+1 -1
View File
@@ -15,7 +15,7 @@ to_reader :: to_stream
@(private) @(private)
error_to_io_Platform_Error :: proc(ferr: Error) -> io.Error { error_to_io_error :: proc(ferr: Error) -> io.Error {
if ferr == nil { if ferr == nil {
return .None return .None
} }
core/os/os2/process_windows.odin
+7 -7
View File
@@ -101,7 +101,7 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
if selection >= {.PPid, .Priority} { if selection >= {.PPid, .Priority} {
entry, entry_err := _process_entry_by_pid(info.pid) entry, entry_err := _process_entry_by_pid(info.pid)
if entry_err != nil { if entry_err != nil {
err = GeneralPlatform_Error.Not_Exist err = General_Error.Not_Exist
return return
} }
if .PPid in selection { if .PPid in selection {
@@ -147,7 +147,7 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
} }
if process_info.PebBaseAddress == nil { if process_info.PebBaseAddress == nil {
// Not sure what the error is // Not sure what the error is
err = GeneralPlatform_Error.Unsupported err = General_Error.Unsupported
return return
} }
process_peb: win32.PEB process_peb: win32.PEB
@@ -210,7 +210,7 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
if selection >= {.PPid, .Priority} { // snap process if selection >= {.PPid, .Priority} { // snap process
entry, entry_err := _process_entry_by_pid(info.pid) entry, entry_err := _process_entry_by_pid(info.pid)
if entry_err != nil { if entry_err != nil {
err = GeneralPlatform_Error.Not_Exist err = General_Error.Not_Exist
return return
} }
if .PPid in selection { if .PPid in selection {
@@ -239,7 +239,7 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
} }
if process_info.PebBaseAddress == nil { if process_info.PebBaseAddress == nil {
// Not sure what the error is // Not sure what the error is
err = GeneralPlatform_Error.Unsupported err = General_Error.Unsupported
return return
} }
@@ -301,7 +301,7 @@ _current_process_info :: proc(selection: Process_Info_Fields, allocator: runtime
if selection >= {.PPid, .Priority} { // snap process if selection >= {.PPid, .Priority} { // snap process
entry, entry_err := _process_entry_by_pid(info.pid) entry, entry_err := _process_entry_by_pid(info.pid)
if entry_err != nil { if entry_err != nil {
err = GeneralPlatform_Error.Not_Exist err = General_Error.Not_Exist
return return
} }
if .PPid in selection { if .PPid in selection {
@@ -459,7 +459,7 @@ _process_wait :: proc(process: Process, timeout: time.Duration) -> (process_stat
} }
return return
case win32.WAIT_TIMEOUT: case win32.WAIT_TIMEOUT:
err = GeneralPlatform_Error.Timeout err = General_Error.Timeout
return return
case: case:
err = _get_platform_error() err = _get_platform_error()
@@ -508,7 +508,7 @@ _process_entry_by_pid :: proc(pid: int) -> (entry: win32.PROCESSENTRY32W, err: E
} }
status = win32.Process32NextW(snap, &entry) status = win32.Process32NextW(snap, &entry)
} }
err = GeneralPlatform_Error.Not_Exist err = General_Error.Not_Exist
return return
} }