doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dqn: Address more warnings from clang

Browse Source
This commit is contained in:
doyle 2023-04-16 00:35:03 +10:00
parent c8a1d796b0
commit 3154f8b2f7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dqn.h
View File

@ -279,7 +279,7 @@
} }
#endif #endif
#if defined(__cplusplus__) #if defined(__cplusplus)
#define DQN_ZERO_INIT {} #define DQN_ZERO_INIT {}
#else #else
#define DQN_ZERO_INIT {0} #define DQN_ZERO_INIT {0}
@ -1141,9 +1141,9 @@ struct Dqn_String16 /// A pointer and length style string that holds slices to U
#define DQN_STRING_FMT(string) (int)((string).size), (string).data #define DQN_STRING_FMT(string) (int)((string).size), (string).data
#if defined(__cplusplus) #if defined(__cplusplus)
#define Dqn_String8_Init(data, size) Dqn_String8{(char *)(data), (Dqn_usize)(size)} #define Dqn_String8_Init(data, size) (Dqn_String8{(char *)(data), (Dqn_usize)(size)})
#else #else
#define Dqn_String8_Init(data, size) (Dqn_String8){data, size} #define Dqn_String8_Init(data, size) (Dqn_String8){(data), (size)}
#endif #endif
#define Dqn_String8_InitF(allocator, fmt, ...) Dqn_String8_InitF_(DQN_LEAK_TRACE allocator, fmt, ## __VA_ARGS__) #define Dqn_String8_InitF(allocator, fmt, ...) Dqn_String8_InitF_(DQN_LEAK_TRACE allocator, fmt, ## __VA_ARGS__)
@ -2738,8 +2738,8 @@ DQN_API int Dqn_UTF16_EncodeCodepoint(uint16_t utf16[2], uint32_t codepoint);
// @return The byte representation of the hex string. // @return The byte representation of the hex string.
struct Dqn_BinHexU64String struct Dqn_BinHexU64String
{ {
char data[2 /*0x*/ + 16 /*hex*/ + 1 /*null-terminator*/]; char data[2 /*0x*/ + 16 /*hex*/ + 1 /*null-terminator*/];
int8_t size; uint8_t size;
}; };
enum Dqn_BinHexU64StringFlags enum Dqn_BinHexU64StringFlags
@ -7228,7 +7228,7 @@ DQN_API Dqn_BinHexU64String Dqn_Bin_U64ToHexU64String(uint64_t number, uint32_t
char const *fmt = (flags & Dqn_BinHexU64StringFlags_UppercaseHex) ? "%I64X" : "%I64x"; char const *fmt = (flags & Dqn_BinHexU64StringFlags_UppercaseHex) ? "%I64X" : "%I64x";
int size = STB_SPRINTF_DECORATE(snprintf)(result.data + result.size, DQN_ARRAY_UCOUNT(result.data) - result.size, fmt, number); int size = STB_SPRINTF_DECORATE(snprintf)(result.data + result.size, DQN_ARRAY_UCOUNT(result.data) - result.size, fmt, number);
result.size += Dqn_Safe_SaturateCastIntToI8(size); result.size += DQN_CAST(uint8_t)size;
DQN_ASSERT(result.size < DQN_ARRAY_UCOUNT(result.data)); DQN_ASSERT(result.size < DQN_ARRAY_UCOUNT(result.data));
// NOTE: snprintf returns the required size of the format string // NOTE: snprintf returns the required size of the format string
@ -7636,11 +7636,11 @@ DQN_API Dqn_String16 Dqn_Win_String8ToString16Allocator(Dqn_String8 src, Dqn_All
{ {
Dqn_String16 result = {}; Dqn_String16 result = {};
int required = Dqn_Win_String8ToCString16(src, nullptr, 0); int required = Dqn_Win_String8ToCString16(src, nullptr, 0);
if (required != 0) { if (required > 0) {
result.data = Dqn_Allocator_NewArray(allocator, wchar_t, required + 1, Dqn_ZeroMem_No); result.data = Dqn_Allocator_NewArray(allocator, wchar_t, required + 1, Dqn_ZeroMem_No);
if (result.data) { if (result.data) {
result.size = Dqn_Win_String8ToCString16(src, result.data, required + 1); result.size = Dqn_Win_String8ToCString16(src, result.data, required + 1);
DQN_ASSERT(result.size == required); DQN_ASSERT(result.size == DQN_CAST(Dqn_usize)required);
} }
} }
return result; return result;
@ -7697,7 +7697,7 @@ DQN_API Dqn_String8 Dqn_Win_String16ToString8Allocator(Dqn_String16 src, Dqn_All
DQN_API Dqn_usize Dqn_Win_EXEDirW(wchar_t *buffer, Dqn_usize size) DQN_API Dqn_usize Dqn_Win_EXEDirW(wchar_t *buffer, Dqn_usize size)
{ {
wchar_t module_path[DQN_OS_WIN32_MAX_PATH]; wchar_t module_path[DQN_OS_WIN32_MAX_PATH];
int module_size = GetModuleFileNameW(nullptr /*module*/, module_path, DQN_ARRAY_UCOUNT(module_path)); Dqn_usize module_size = DQN_CAST(Dqn_usize)GetModuleFileNameW(nullptr /*module*/, module_path, DQN_ARRAY_UCOUNT(module_path));
DQN_HARD_ASSERTF(GetLastError() != ERROR_INSUFFICIENT_BUFFER, "How the hell?"); DQN_HARD_ASSERTF(GetLastError() != ERROR_INSUFFICIENT_BUFFER, "How the hell?");
Dqn_usize result = 0; Dqn_usize result = 0;
@ -8678,10 +8678,10 @@ DQN_API bool Dqn_Fs_Copy(Dqn_String8 src, Dqn_String8 dest, bool overwrite)
DQN_API bool Dqn_Fs_MakeDir(Dqn_String8 path) DQN_API bool Dqn_Fs_MakeDir(Dqn_String8 path)
{ {
Dqn_ThreadScratch scratch = Dqn_Thread_GetScratch(nullptr); Dqn_ThreadScratch scratch = Dqn_Thread_GetScratch(nullptr);
bool result = true; bool result = true;
int path_indexes_size = 0; Dqn_usize path_indexes_size = 0;
uint16_t path_indexes[64] = {}; uint16_t path_indexes[64] = {};
#if defined(DQN_OS_WIN32) #if defined(DQN_OS_WIN32)
Dqn_String16 path16 = Dqn_Win_String8ToString16Allocator(path, Dqn_Arena_Allocator(scratch.arena)); Dqn_String16 path16 = Dqn_Win_String8ToString16Allocator(path, Dqn_Arena_Allocator(scratch.arena));

6
dqn_unit_tests.cpp
View File

@ -56,7 +56,7 @@ Dqn_Tester TestArena()
DQN_TESTER_ASSERT(&test, first_ptr_address == DQN_CAST(uintptr_t)ptr); DQN_TESTER_ASSERT(&test, first_ptr_address == DQN_CAST(uintptr_t)ptr);
// NOTE: Check that the bytes are set to 0 // NOTE: Check that the bytes are set to 0
for (int i = 0; i < size; i++) for (Dqn_usize i = 0; i < size; i++)
DQN_TESTER_ASSERT(&test, ptr[i] == 0); DQN_TESTER_ASSERT(&test, ptr[i] == 0);
} }
} }
@ -1548,11 +1548,11 @@ Dqn_Tester TestVArray()
DQN_TESTER_ASSERT(&test, (uintptr_t)data_item_b == (uintptr_t)(make_item_a + 1)); DQN_TESTER_ASSERT(&test, (uintptr_t)data_item_b == (uintptr_t)(make_item_a + 1));
DQN_TESTER_ASSERT(&test, (uintptr_t)data_item_b == (uintptr_t)make_item_b); DQN_TESTER_ASSERT(&test, (uintptr_t)data_item_b == (uintptr_t)make_item_b);
for (int i = 0; i < sizeof(data_item_a->data); i++) { for (Dqn_usize i = 0; i < sizeof(data_item_a->data); i++) {
DQN_TESTER_ASSERT(&test, data_item_a->data[i] == 'a'); DQN_TESTER_ASSERT(&test, data_item_a->data[i] == 'a');
} }
for (int i = 0; i < sizeof(data_item_b->data); i++) { for (Dqn_usize i = 0; i < sizeof(data_item_b->data); i++) {
DQN_TESTER_ASSERT(&test, data_item_b->data[i] == 'b'); DQN_TESTER_ASSERT(&test, data_item_b->data[i] == 'b');
} }
} }