From f0a7f1812f0884348f03f56bac7560bbb6eefbf8 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 29 Jan 2024 16:29:56 +0000 Subject: Rename `runtime.os_write` to `runtime.stderr_write` --- base/runtime/os_specific.odin | 4 ++-- base/runtime/os_specific_bsd.odin | 2 +- base/runtime/os_specific_darwin.odin | 2 +- base/runtime/os_specific_freestanding.odin | 2 +- base/runtime/os_specific_js.odin | 2 +- base/runtime/os_specific_linux.odin | 2 +- base/runtime/os_specific_wasi.odin | 2 +- base/runtime/os_specific_windows.odin | 4 ++-- base/runtime/print.odin | 12 ++++++------ 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/base/runtime/os_specific.odin b/base/runtime/os_specific.odin index 022d315d4..2807eaf90 100644 --- a/base/runtime/os_specific.odin +++ b/base/runtime/os_specific.odin @@ -2,6 +2,6 @@ package runtime _OS_Errno :: distinct int -os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { - return _os_write(data) +stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { + return _stderr_write(data) } diff --git a/base/runtime/os_specific_bsd.odin b/base/runtime/os_specific_bsd.odin index 7f23b625e..9cd065ff6 100644 --- a/base/runtime/os_specific_bsd.odin +++ b/base/runtime/os_specific_bsd.odin @@ -12,7 +12,7 @@ foreign libc { __error :: proc() -> ^i32 --- } -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { ret := _unix_write(2, raw_data(data), len(data)) if ret < len(data) { err := __error() diff --git a/base/runtime/os_specific_darwin.odin b/base/runtime/os_specific_darwin.odin index 0cb46024c..5d2709d1f 100644 --- a/base/runtime/os_specific_darwin.odin +++ b/base/runtime/os_specific_darwin.odin @@ -16,7 +16,7 @@ foreign libc { _get_errno :: proc() -> ^i32 --- } -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { ret := _fwrite(raw_data(data), 1, len(data), _stderr) if ret < len(data) { err := _get_errno() diff --git a/base/runtime/os_specific_freestanding.odin b/base/runtime/os_specific_freestanding.odin index 817b22483..08ca4aa55 100644 --- a/base/runtime/os_specific_freestanding.odin +++ b/base/runtime/os_specific_freestanding.odin @@ -3,6 +3,6 @@ package runtime // TODO(bill): reimplement `os.write` -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { return 0, -1 } diff --git a/base/runtime/os_specific_js.odin b/base/runtime/os_specific_js.odin index 541c785ef..d35753604 100644 --- a/base/runtime/os_specific_js.odin +++ b/base/runtime/os_specific_js.odin @@ -4,7 +4,7 @@ package runtime foreign import "odin_env" -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { foreign odin_env { write :: proc "contextless" (fd: u32, p: []byte) --- } diff --git a/base/runtime/os_specific_linux.odin b/base/runtime/os_specific_linux.odin index abcfc741b..a944ba309 100644 --- a/base/runtime/os_specific_linux.odin +++ b/base/runtime/os_specific_linux.odin @@ -3,7 +3,7 @@ package runtime import "base:intrinsics" -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { when ODIN_ARCH == .amd64 { SYS_write :: uintptr(1) } else when ODIN_ARCH == .arm64 { diff --git a/base/runtime/os_specific_wasi.odin b/base/runtime/os_specific_wasi.odin index 502f027f0..94fa5fa89 100644 --- a/base/runtime/os_specific_wasi.odin +++ b/base/runtime/os_specific_wasi.odin @@ -4,7 +4,7 @@ package runtime import "core:sys/wasm/wasi" -_os_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { +_stderr_write :: proc "contextless" (data: []byte) -> (int, _OS_Errno) { data := (wasi.ciovec_t)(data) n, err := wasi.fd_write(1, {data}) return int(n), _OS_Errno(err) diff --git a/base/runtime/os_specific_windows.odin b/base/runtime/os_specific_windows.odin index 74681a3ab..6da569aee 100644 --- a/base/runtime/os_specific_windows.odin +++ b/base/runtime/os_specific_windows.odin @@ -9,14 +9,14 @@ foreign import kernel32 "system:Kernel32.lib" foreign kernel32 { // NOTE(bill): The types are not using the standard names (e.g. DWORD and LPVOID) to just minimizing the dependency - // os_write + // stderr_write GetStdHandle :: proc(which: u32) -> rawptr --- SetHandleInformation :: proc(hObject: rawptr, dwMask: u32, dwFlags: u32) -> b32 --- WriteFile :: proc(hFile: rawptr, lpBuffer: rawptr, nNumberOfBytesToWrite: u32, lpNumberOfBytesWritten: ^u32, lpOverlapped: rawptr) -> b32 --- GetLastError :: proc() -> u32 --- } -_os_write :: proc "contextless" (data: []byte) -> (n: int, err: _OS_Errno) #no_bounds_check { +_stderr_write :: proc "contextless" (data: []byte) -> (n: int, err: _OS_Errno) #no_bounds_check { if len(data) == 0 { return 0, 0 } diff --git a/base/runtime/print.odin b/base/runtime/print.odin index 87c8757d5..41ff9e1bb 100644 --- a/base/runtime/print.odin +++ b/base/runtime/print.odin @@ -123,13 +123,13 @@ encode_rune :: proc "contextless" (c: rune) -> ([4]u8, int) { } print_string :: proc "contextless" (str: string) -> (n: int) { - n, _ = os_write(transmute([]byte)str) + n, _ = stderr_write(transmute([]byte)str) return } print_strings :: proc "contextless" (args: ..string) -> (n: int) { for str in args { - m, err := os_write(transmute([]byte)str) + m, err := stderr_write(transmute([]byte)str) n += m if err != 0 { break @@ -139,7 +139,7 @@ print_strings :: proc "contextless" (args: ..string) -> (n: int) { } print_byte :: proc "contextless" (b: byte) -> (n: int) { - n, _ = os_write([]byte{b}) + n, _ = stderr_write([]byte{b}) return } @@ -178,7 +178,7 @@ print_rune :: proc "contextless" (r: rune) -> int #no_bounds_check { } b, n := encode_rune(r) - m, _ := os_write(b[:n]) + m, _ := stderr_write(b[:n]) return m } @@ -194,7 +194,7 @@ print_u64 :: proc "contextless" (x: u64) #no_bounds_check { } i -= 1; a[i] = _INTEGER_DIGITS_VAR[u % b] - os_write(a[i:]) + stderr_write(a[i:]) } @@ -216,7 +216,7 @@ print_i64 :: proc "contextless" (x: i64) #no_bounds_check { i -= 1; a[i] = '-' } - os_write(a[i:]) + stderr_write(a[i:]) } print_uint :: proc "contextless" (x: uint) { print_u64(u64(x)) } -- cgit v1.2.3