diff options
| -rw-r--r-- | core/net/dns_os.odin | 14 | ||||
| -rw-r--r-- | core/testing/signal_handler_libc.odin | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/net/dns_os.odin b/core/net/dns_os.odin index 19db0097a..8528dad00 100644 --- a/core/net/dns_os.odin +++ b/core/net/dns_os.odin @@ -2,12 +2,13 @@ #+private package net -import "core:os" +import os "core:os/os2" load_resolv_conf :: proc(resolv_conf_path: string, allocator := context.allocator) -> (name_servers: []Endpoint, ok: bool) { context.allocator = allocator - res := os.read_entire_file_from_filename(resolv_conf_path) or_return + res, err := os.read_entire_file(resolv_conf_path, allocator) + if err != nil { return } defer delete(res) resolv_str := string(res) @@ -15,10 +16,9 @@ load_resolv_conf :: proc(resolv_conf_path: string, allocator := context.allocato } load_hosts :: proc(hosts_file_path: string, allocator := context.allocator) -> (hosts: []DNS_Host_Entry, ok: bool) { - hosts_file, err := os.open(hosts_file_path) + handle, err := os.open(hosts_file_path) if err != nil { return } - defer os.close(hosts_file) - - return parse_hosts(os.stream_from_handle(hosts_file), allocator) -} + defer os.close(handle) + return parse_hosts(os.to_stream(handle), allocator) +}
\ No newline at end of file diff --git a/core/testing/signal_handler_libc.odin b/core/testing/signal_handler_libc.odin index 593d2c285..badee802d 100644 --- a/core/testing/signal_handler_libc.odin +++ b/core/testing/signal_handler_libc.odin @@ -91,7 +91,7 @@ stop_test_callback :: proc "c" (sig: libc.int) { advisory_a := ` The test runner's main thread has caught an unrecoverable error (signal ` advisory_b := `) and will now forcibly terminate. -This is a dire bug and should be reported to the Odin developers. +Unless you terminated the tests yourself, this could be a dire bug and should be reported to the Odin developers. ` libc.fwrite(raw_data(advisory_a), size_of(byte), len(advisory_a), libc.stderr) libc.fwrite(raw_data(sigstr), size_of(byte), len(sigstr), libc.stderr) |