From 8f91ec4f882a2566a340a878b130114d1e572131 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Mon, 16 Dec 2024 11:41:23 -0800 Subject: [PATCH] fix __va_args__ nonsense in rdi_from_dwarf; fix incorrect mask check in linux os_file_open --- src/os/core/linux/os_core_linux.c | 2 +- src/rdi_from_dwarf/rdi_from_dwarf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/core/linux/os_core_linux.c b/src/os/core/linux/os_core_linux.c index 86e57e98..604786b4 100644 --- a/src/os/core/linux/os_core_linux.c +++ b/src/os/core/linux/os_core_linux.c @@ -267,7 +267,7 @@ os_file_open(OS_AccessFlags flags, String8 path) Temp scratch = scratch_begin(0, 0); String8 path_copy = push_str8_copy(scratch.arena, path); int lnx_flags = 0; - if(flags & (OS_AccessFlag_Read|OS_AccessFlag_Write)) + if(flags & OS_AccessFlag_Read && flags & OS_AccessFlag_Write) { lnx_flags = O_RDWR; } diff --git a/src/rdi_from_dwarf/rdi_from_dwarf.c b/src/rdi_from_dwarf/rdi_from_dwarf.c index 1aa8356e..bfb70be2 100644 --- a/src/rdi_from_dwarf/rdi_from_dwarf.c +++ b/src/rdi_from_dwarf/rdi_from_dwarf.c @@ -430,9 +430,9 @@ entry_point(CmdLine *cmd_line) // track parse success B32 successful_parse = 1; -#define PARSE_CHECK_ERROR(p,fmt,...) do{ if ((p) == 0){ \ +#define PARSE_CHECK_ERROR(p, fmt, ...) do{ if ((p) == 0){ \ successful_parse = 0; \ -fprintf(stdout, "error(parsing): " fmt "\n", __VA_ARGS__); \ +fprintf(stdout, "error(parsing): " fmt "\n",##__VA_ARGS__); \ } }while(0) // parse elf