Browse Source

update ARENA_ALLOC macro args

main
cinnaboot 5 years ago
parent
commit
40576a64a3
  1. 2
      src/asset.cpp
  2. 3
      src/asset.h

2
src/asset.cpp

@ -75,7 +75,7 @@ arenaCopyCStr(memory_arena* arena, const char* input, u32 max_len)
{ {
u32 name_len = std::strlen(input) + 1; u32 name_len = std::strlen(input) + 1;
assert(name_len < max_len); assert(name_len < max_len);
char* out = ARENA_ALLOC(arena, name_len, char); char* out = ARENA_ALLOC(arena, char, name_len);
std::strncpy(out, input, name_len); std::strncpy(out, input, name_len);
return out; return out;
} }

3
src/asset.h

@ -33,7 +33,8 @@ void arenaFree(memory_arena*& arena);
uint arenaGetFreeSize(memory_arena* arena); uint arenaGetFreeSize(memory_arena* arena);
#define ARENA_ALLOC(arena, len, type) (type*) arenaAllocateBlock(arena, len) #define ARENA_ALLOC(arena, type, count) \
(type*) arenaAllocateBlock(arena, sizeof(type) * count)
void* arenaAllocateBlock(memory_arena* arena, size_t block_size); void* arenaAllocateBlock(memory_arena* arena, size_t block_size);
#define MAX_NAME_LENGTH 256 #define MAX_NAME_LENGTH 256

Loading…
Cancel
Save