mirror of
https://github.com/Ed94/Odin.git
synced 2026-06-23 22:25:00 -07:00
Fix copy-replace errors
This commit is contained in:
@@ -3,7 +3,7 @@ package os2
|
||||
import "core:io"
|
||||
import "base:runtime"
|
||||
|
||||
General_Platform_Error :: enum u32 {
|
||||
General_Error :: enum u32 {
|
||||
None,
|
||||
|
||||
Permission_Denied,
|
||||
@@ -29,7 +29,7 @@ General_Platform_Error :: enum u32 {
|
||||
Unsupported,
|
||||
}
|
||||
|
||||
Platform_Platform_Error :: enum i32 {None=0}
|
||||
Platform_Error :: enum i32 {None=0}
|
||||
|
||||
Error :: union #shared_nil {
|
||||
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 {}
|
||||
return i32(v), i32(v) != 0
|
||||
}
|
||||
@@ -104,7 +104,7 @@ error_string :: proc(ferr: Error) -> string {
|
||||
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()
|
||||
err_str := error_string(ferr)
|
||||
|
||||
|
||||
@@ -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 {
|
||||
case .NONE:
|
||||
return nil
|
||||
|
||||
@@ -20,7 +20,7 @@ _error_string :: proc(errno: i32) -> string {
|
||||
return "<unknown platform error>"
|
||||
}
|
||||
|
||||
_get_platform_Platform_Error :: proc() -> Error {
|
||||
_get_platform_error :: proc() -> Error {
|
||||
err := win32.GetLastError()
|
||||
if err == 0 {
|
||||
return nil
|
||||
|
||||
@@ -15,7 +15,7 @@ to_reader :: to_stream
|
||||
|
||||
|
||||
@(private)
|
||||
error_to_io_Platform_Error :: proc(ferr: Error) -> io.Error {
|
||||
error_to_io_error :: proc(ferr: Error) -> io.Error {
|
||||
if ferr == nil {
|
||||
return .None
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ _process_info_by_pid :: proc(pid: int, selection: Process_Info_Fields, allocator
|
||||
if selection >= {.PPid, .Priority} {
|
||||
entry, entry_err := _process_entry_by_pid(info.pid)
|
||||
if entry_err != nil {
|
||||
err = GeneralPlatform_Error.Not_Exist
|
||||
err = General_Error.Not_Exist
|
||||
return
|
||||
}
|
||||
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 {
|
||||
// Not sure what the error is
|
||||
err = GeneralPlatform_Error.Unsupported
|
||||
err = General_Error.Unsupported
|
||||
return
|
||||
}
|
||||
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
|
||||
entry, entry_err := _process_entry_by_pid(info.pid)
|
||||
if entry_err != nil {
|
||||
err = GeneralPlatform_Error.Not_Exist
|
||||
err = General_Error.Not_Exist
|
||||
return
|
||||
}
|
||||
if .PPid in selection {
|
||||
@@ -239,7 +239,7 @@ _process_info_by_handle :: proc(process: Process, selection: Process_Info_Fields
|
||||
}
|
||||
if process_info.PebBaseAddress == nil {
|
||||
// Not sure what the error is
|
||||
err = GeneralPlatform_Error.Unsupported
|
||||
err = General_Error.Unsupported
|
||||
return
|
||||
}
|
||||
|
||||
@@ -301,7 +301,7 @@ _current_process_info :: proc(selection: Process_Info_Fields, allocator: runtime
|
||||
if selection >= {.PPid, .Priority} { // snap process
|
||||
entry, entry_err := _process_entry_by_pid(info.pid)
|
||||
if entry_err != nil {
|
||||
err = GeneralPlatform_Error.Not_Exist
|
||||
err = General_Error.Not_Exist
|
||||
return
|
||||
}
|
||||
if .PPid in selection {
|
||||
@@ -459,7 +459,7 @@ _process_wait :: proc(process: Process, timeout: time.Duration) -> (process_stat
|
||||
}
|
||||
return
|
||||
case win32.WAIT_TIMEOUT:
|
||||
err = GeneralPlatform_Error.Timeout
|
||||
err = General_Error.Timeout
|
||||
return
|
||||
case:
|
||||
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)
|
||||
}
|
||||
err = GeneralPlatform_Error.Not_Exist
|
||||
err = General_Error.Not_Exist
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user