From f4cf88c2ca4411d15fda754344f9ca7d3de6b8ab Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 4 Mar 2018 11:38:49 +0000 Subject: [PATCH] Move os_*.odin files to os/ --- core/mem.odin | 4 +-- core/os.odin | 8 +++--- core/{os_essence.odin => os/essence.odin} | 0 core/{os_linux.odin => os/linux.odin} | 0 core/{os_x.odin => os/osx.odin} | 0 core/{os_windows.odin => os/windows.odin} | 33 +++++++++++------------ 6 files changed, 22 insertions(+), 23 deletions(-) rename core/{os_essence.odin => os/essence.odin} (100%) rename core/{os_linux.odin => os/linux.odin} (100%) rename core/{os_x.odin => os/osx.odin} (100%) rename core/{os_windows.odin => os/windows.odin} (91%) diff --git a/core/mem.odin b/core/mem.odin index 7e50a4e66..b9550a77b 100644 --- a/core/mem.odin +++ b/core/mem.odin @@ -38,8 +38,8 @@ slice_to_bytes :: proc "contextless" (slice: $E/[]$T) -> []byte { } ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte { - assert(len >= 0); - return transmute([]byte)raw.Slice{ptr, len*size_of(T)}; + assert(len >= 0); + return transmute([]byte)raw.Slice{ptr, len*size_of(T)}; } any_to_bytes :: proc "contextless" (val: any) -> []byte { diff --git a/core/os.odin b/core/os.odin index 4de19e031..6fbbabd94 100644 --- a/core/os.odin +++ b/core/os.odin @@ -1,7 +1,7 @@ -when ODIN_OS == "windows" do export "core:os_windows.odin"; -when ODIN_OS == "osx" do export "core:os_x.odin"; -when ODIN_OS == "linux" do export "core:os_linux.odin"; -when ODIN_OS == "essence" do export "core:os_essence.odin"; +when ODIN_OS == "windows" do export "core:os/windows.odin"; +when ODIN_OS == "osx" do export "core:os/osx.odin"; +when ODIN_OS == "linux" do export "core:os/linux.odin"; +when ODIN_OS == "essence" do export "core:os/essence.odin"; import "mem.odin"; diff --git a/core/os_essence.odin b/core/os/essence.odin similarity index 100% rename from core/os_essence.odin rename to core/os/essence.odin diff --git a/core/os_linux.odin b/core/os/linux.odin similarity index 100% rename from core/os_linux.odin rename to core/os/linux.odin diff --git a/core/os_x.odin b/core/os/osx.odin similarity index 100% rename from core/os_x.odin rename to core/os/osx.odin diff --git a/core/os_windows.odin b/core/os/windows.odin similarity index 91% rename from core/os_windows.odin rename to core/os/windows.odin index 62f35740d..90674b594 100644 --- a/core/os_windows.odin +++ b/core/os/windows.odin @@ -260,26 +260,25 @@ current_thread_id :: proc() -> int { - _alloc_command_line_arguments :: proc() -> []string { - arg_count: i32; - arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count); - arg_list := make([]string, int(arg_count)); - for _, i in arg_list { - wc_str := (arg_list_ptr+i)^; - olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1, - nil, 0, nil, nil); + arg_count: i32; + arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count); + arg_list := make([]string, int(arg_count)); + for _, i in arg_list { + wc_str := (arg_list_ptr+i)^; + olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1, + nil, 0, nil, nil); - buf := make([]byte, olen); - n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1, - cstring(&buf[0]), olen, nil, nil); - if n > 0 { - n -= 1; - } - arg_list[i] = string(buf[..n]); - } + buf := make([]byte, olen); + n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1, + cstring(&buf[0]), olen, nil, nil); + if n > 0 { + n -= 1; + } + arg_list[i] = string(buf[..n]); + } - return arg_list; + return arg_list; }