more test cleanup

This commit is contained in:
Colin Davidson
2023-03-01 08:27:07 -08:00
parent caf9716bf1
commit 2ca30e3acd
3 changed files with 6 additions and 15 deletions

View File

@@ -25,20 +25,11 @@ import "core:os"
Default configuration for DNS resolution.
*/
when ODIN_OS == .Windows {
getenv :: proc(key: string) -> (val: string) {
return os.get_env(key)
}
DEFAULT_DNS_CONFIGURATION :: DNS_Configuration{
resolv_conf = "",
hosts_file = "%WINDIR%\\system32\\drivers\\etc\\hosts",
}
} else when ODIN_OS == .Linux || ODIN_OS == .Darwin || ODIN_OS == .OpenBSD {
getenv :: proc(key: string) -> (val: string) {
val, _ = os.getenv(key)
return
}
DEFAULT_DNS_CONFIGURATION :: DNS_Configuration{
resolv_conf = "/etc/resolv.conf",
hosts_file = "/etc/hosts",
@@ -81,7 +72,7 @@ replace_environment_path :: proc(path: string, allocator := context.allocator) -
assert(right > 0 && right <= len(path)) // should be covered by there being two %
env_key := path[left: right]
env_val := getenv(env_key)
env_val := os.get_env(env_key)
defer delete(env_val)
res, _ = strings.replace(path, path[left - 1: right + 1], env_val, 1)

View File

@@ -56,13 +56,13 @@ physical_address_to_string :: proc(phy_addr: []u8, allocator := context.allocato
for b, i in phy_addr {
if i > 0 {
strings.write_rune_builder(&buf, ':')
strings.write_rune(&buf, ':')
}
hi := rune(MAC_HEX[b >> 4])
lo := rune(MAC_HEX[b & 15])
strings.write_rune_builder(&buf, hi)
strings.write_rune_builder(&buf, lo)
strings.write_rune(&buf, hi)
strings.write_rune(&buf, lo)
}
return strings.to_string(buf)
}
}

View File

@@ -117,7 +117,7 @@ percent_decode :: proc(encoded_string: string, allocator := context.allocator) -
b := builder_make(allocator)
builder_grow(&b, len(encoded_string))
defer if !ok do destroy_builder(&b)
defer if !ok do builder_destroy(&b)
stack_buf: [4]u8
pending := mem.buffer_from_slice(stack_buf[:])