Fix auto formatting
This commit is contained in:
parent
8cc17f1490
commit
42187beee5
@ -80,13 +80,14 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
|
|||||||
|
|
||||||
#ifdef WAPP_PLATFORM_WINDOWS
|
#ifdef WAPP_PLATFORM_WINDOWS
|
||||||
if (!(arena->committed)) {
|
if (!(arena->committed)) {
|
||||||
output = (u8 *)wapp_mem_util_alloc(output, size, WAPP_MEM_ACCESS_READ_WRITE,
|
output = (u8 *)wapp_mem_util_alloc(
|
||||||
WAPP_MEM_ALLOC_COMMIT,
|
alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
|
||||||
WAPP_MEM_INIT_UNINITIALISED);
|
WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
|
||||||
|
WAPP_MEM_INIT_INITIALISED);
|
||||||
}
|
}
|
||||||
#endif // ifdef WAPP_PLATFORM_WINDOWS
|
#else
|
||||||
|
|
||||||
memset(output, 0, size);
|
memset(output, 0, size);
|
||||||
|
#endif // ifdef WAPP_PLATFORM_WINDOWS
|
||||||
|
|
||||||
return (void *)output;
|
return (void *)output;
|
||||||
}
|
}
|
||||||
|
@ -115,7 +115,7 @@ StringUpdate wapp_dstr_concat(String **dst, const char *src, Arena *arena) {
|
|||||||
#else
|
#else
|
||||||
char str[new_length + 1];
|
char str[new_length + 1];
|
||||||
memset(str, 0, new_length + 1);
|
memset(str, 0, new_length + 1);
|
||||||
#endif
|
#endif /* ifdef WAPP_PLATFORM_WINDOWS */
|
||||||
|
|
||||||
strncpy(str, (*dst)->buf, (*dst)->size);
|
strncpy(str, (*dst)->buf, (*dst)->size);
|
||||||
strncat(str, src, new_length + 1 - (*dst)->size);
|
strncat(str, src, new_length + 1 - (*dst)->size);
|
||||||
|
Loading…
Reference in New Issue
Block a user