From 0c796768e5f4e1bbfa0bb1a85c208b49a8789fc0 Mon Sep 17 00:00:00 2001 From: jacob Date: Tue, 2 Dec 2025 16:22:22 -0600 Subject: [PATCH] remove unused-variable relaxation hints --- src/ase/ase.c | 3 --- src/asset_cache/asset_cache.c | 1 - src/base/base.h | 13 +------------ src/base/base_arena.c | 1 - src/base/base_snc.h | 4 ++-- src/base/base_win32/base_win32.c | 9 ++++----- src/draw/draw.c | 1 - src/mixer/mixer.c | 2 -- src/platform/platform_win32/platform_win32.c | 5 ++--- src/playback/playback_wasapi/playback_wasapi.c | 2 +- src/sound/sound.c | 2 +- src/ttf/ttf_dwrite/ttf_dwrite.c | 1 - 12 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/ase/ase.c b/src/ase/ase.c index 04993e26..1cbc0838 100644 --- a/src/ase/ase.c +++ b/src/ase/ase.c @@ -238,8 +238,6 @@ void ASE_Inflate(u8 *dst, u8 *encoded) u8 cmf = (u8)(cm | (cinfo << 4)); u8 flg = fcheck | (fdict << 5) | (flevl << 6); - LAX cmf; - LAX flg; Assert(((cmf * 256) + flg) % 31 == 0); u8 bfinal = 0; @@ -255,7 +253,6 @@ void ASE_Inflate(u8 *dst, u8 *encoded) i16 len = ASE_ConsumeBits(&bb, 16); i16 nlen = ASE_ConsumeBits(&bb, 16); Assert(len == ~nlen); /* Validation */ - LAX nlen; while (len-- > 0) { *dst++ = ASE_ConsumeBits(&bb, 8); diff --git a/src/asset_cache/asset_cache.c b/src/asset_cache/asset_cache.c index d82c6699..5f670584 100644 --- a/src/asset_cache/asset_cache.c +++ b/src/asset_cache/asset_cache.c @@ -49,7 +49,6 @@ AC_Asset *AC_GetAssetCacheSlotLocked(Lock *lock, String key, u64 hash) { AC_SharedState *g = &AC_shared_state; AssertLockedES(lock, &g->lookup_mutex); - LAX lock; u64 index = hash % countof(g->lookup); for (;;) diff --git a/src/base/base.h b/src/base/base.h index 3ade035c..b511b45c 100644 --- a/src/base/base.h +++ b/src/base/base.h @@ -152,7 +152,7 @@ #define Assert(cond) ((cond) ? 1 : (__builtin_trap(), 0)) #define DEBUGBREAK __builtin_debugtrap() #endif - #define DEBUGBREAKABLE { volatile i32 __DEBUGBREAKABLE_VAR = 0; LAX __DEBUGBREAKABLE_VAR; } (void)0 + #define DEBUGBREAKABLE { volatile i32 __DEBUGBREAKABLE_VAR = 0; __DEBUGBREAKABLE_VAR; } (void)0 #else #define Assert(cond) (void)(0) #endif @@ -225,17 +225,6 @@ #error Memory barriers not implemented #endif -//- Unused markup -/* Strict unused markup */ -#if IsCompilerClang - #define UNUSED __attribute((unused)) -#else - #define UNUSED -#endif - -/* Relaxed unused markup */ -#define LAX (void) - //- Fallthrough #if IsCompilerClang #define FALLTHROUGH __attribute((fallthrough)) diff --git a/src/base/base_arena.c b/src/base/base_arena.c index f42b32cb..e15a9d65 100644 --- a/src/base/base_arena.c +++ b/src/base/base_arena.c @@ -75,7 +75,6 @@ void ShrinkArena(Arena *arena) { /* Not implemented */ Assert(0); - LAX arena; } void SetArenaReadonly(Arena *arena) diff --git a/src/base/base_snc.h b/src/base/base_snc.h index a765995f..49cb60de 100644 --- a/src/base/base_snc.h +++ b/src/base/base_snc.h @@ -56,8 +56,8 @@ void Unlock(Lock *lock); # define AssertLockedE(l, m) Assert((l)->mutex == (m) && (l)->exclusive == 1) # define AssertLockedES(l, m) Assert((l)->mutex == (m)) #else -# define AssertLockedE(l, m) LAX l -# define AssertLockedES(l, m) LAX l +# define AssertLockedE(l, m) +# define AssertLockedES(l, m) #endif //////////////////////////////////////////////////////////// diff --git a/src/base/base_win32/base_win32.c b/src/base/base_win32/base_win32.c index 9dada622..6d541ab1 100644 --- a/src/base/base_win32/base_win32.c +++ b/src/base/base_win32/base_win32.c @@ -199,7 +199,7 @@ void ExitNow(i32 code) //////////////////////////////////////////////////////////// //~ Startup / shutdown jobs -JobImpl(W32_StartupLayers, UNUSED sig, UNUSED id) +JobImpl(W32_StartupLayers, sig, id) { W32_SharedState *g = &W32_shared_state; TempArena scratch = BeginScratchNoConflict(); @@ -210,7 +210,7 @@ JobImpl(W32_StartupLayers, UNUSED sig, UNUSED id) EndScratch(scratch); } -JobImpl(W32_ShutdownLayers, UNUSED sig, UNUSED id) +JobImpl(W32_ShutdownLayers, sig, id) { __prof; W32_SharedState *g = &W32_shared_state; @@ -291,7 +291,6 @@ i32 W32_Main(void) } } Assert(ok); - LAX ok; } } CloseHandle(thread); @@ -438,12 +437,12 @@ i32 W32_Main(void) #if IsCrtlibEnabled # if IsConsoleApp -int main(UNUSED char **argc, UNUSED int argv) +int main(char **argc, int argv) { return W32_Main(); } # else -int CALLBACK wWinMain(UNUSED _In_ HINSTANCE instance, UNUSED _In_opt_ HINSTANCE prev_instance, UNUSED _In_ LPWSTR cmdline_wstr, UNUSED _In_ int show_code) +int CALLBACK wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev_instance, _In_ LPWSTR cmdline_wstr, _In_ int show_code) { return W32_Main(); } diff --git a/src/draw/draw.c b/src/draw/draw.c index d63743d2..9ea6b50a 100644 --- a/src/draw/draw.c +++ b/src/draw/draw.c @@ -114,7 +114,6 @@ void D_DrawLineGradient(GPU_RenderSig *sig, Vec2 start, Vec2 end, f32 thickness, D_DrawMaterial(sig, D_MATERIALPARAMS(.texture = g->solid_white_texture, .tint0 = start_color, .tint1 = end_color, .quad = quad)); #else /* Placeholder */ - LAX end_color; Quad quad = QuadFromLine(start, end, thickness); D_DrawQuad(sig, quad, start_color); #endif diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index d891c812..c7fe7cb3 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -56,7 +56,6 @@ MIX_Track *MIX_AcquireTrackLocked(Lock *lock, SND_Sound *sound) { MIX_SharedState *g = &M_shared_state; AssertLockedE(lock, &g->mutex); - LAX lock; MIX_Track *track = 0; if (g->track_first_free) @@ -103,7 +102,6 @@ void MIX_ReleaseTrackLocked(Lock *lock, MIX_Track *track) { MIX_SharedState *g = &M_shared_state; AssertLockedE(lock, &g->mutex); - LAX lock; /* Remove from playing list */ MIX_Track *prev = track->prev; diff --git a/src/platform/platform_win32/platform_win32.c b/src/platform/platform_win32/platform_win32.c index c04534c0..4051c0af 100644 --- a/src/platform/platform_win32/platform_win32.c +++ b/src/platform/platform_win32/platform_win32.c @@ -432,7 +432,7 @@ String P_ReadFile(Arena *arena, P_File file) /* TODO: error checking */ PushAlign(arena, CachelineSize); s.text = PushStructsNoZero(arena, u8, size); - LAX ReadFile( + ReadFile( (HANDLE)file.handle, s.text, (DWORD)s.len, @@ -459,7 +459,7 @@ void P_WriteFile(P_File file, String data) } /* WriteFile returns TRUE on success */ - LAX WriteFile( + WriteFile( (HANDLE)file.handle, data.text, (DWORD)data.len, @@ -889,7 +889,6 @@ void P_WriteSock(P_Sock *sock, P_Address address, String data) if (size != (i32)data.len) { i32 err = WSAGetLastError(); - LAX err; Assert(0); } #endif diff --git a/src/playback/playback_wasapi/playback_wasapi.c b/src/playback/playback_wasapi/playback_wasapi.c index de4b8f42..99960b65 100644 --- a/src/playback/playback_wasapi/playback_wasapi.c +++ b/src/playback/playback_wasapi/playback_wasapi.c @@ -182,7 +182,7 @@ void PB_WSP_EndUpdate(PB_WSP_Buff *wspbuf, MIX_PcmF32 src) //////////////////////////////////////////////////////////// //~ Playback job -JobImpl(PB_WSP_Playback, UNUSED sig, UNUSED id) +JobImpl(PB_WSP_Playback, sig, id) { __prof; PB_WSP_SharedState *g = &PB_WSP_shared_state; diff --git a/src/sound/sound.c b/src/sound/sound.c index 54da66a9..dd11a0a6 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// //~ Load job -JobImpl(SND_Load, sig, UNUSED id) +JobImpl(SND_Load, sig, id) { __prof; TempArena scratch = BeginScratchNoConflict(); diff --git a/src/ttf/ttf_dwrite/ttf_dwrite.c b/src/ttf/ttf_dwrite/ttf_dwrite.c index a06f70d7..72d22358 100644 --- a/src/ttf/ttf_dwrite/ttf_dwrite.c +++ b/src/ttf/ttf_dwrite/ttf_dwrite.c @@ -49,7 +49,6 @@ TTF_Decoded TTF_Decode(Arena *arena, String encoded, f32 em_size, u32 *cache_cod /* TODO: handle errors */ HRESULT error = 0; - LAX error; /* File */ IDWriteFontFile *font_file = 0;