Add lovrStrdup macro;

Author: bjornbytes

src/api/l_thread.c

@@ -28,12 +28,9 @@ static char* threadRunner(Thread* thread, Blob* body, Variant* arguments, uint32
   }
 
   // Error handling
-  size_t length;
-  const char* message = lua_tolstring(L, -1, &length);
-
-  if (message) {
-    char* error = lovrMalloc(length + 1);
-    memcpy(error, message, length + 1);
+  if (lua_type(L, -1) == LUA_TSTRING) {
+    const char* message = lua_tostring(L, -1);
+    char* error = lovrStrdup(message);
     lua_close(L);
     return error;
   }

src/modules/data/blob.c

@@ -8,12 +8,7 @@ Blob* lovrBlobCreate(void* data, size_t size, const char* name) {
   blob->ref = 1;
   blob->data = data;
   blob->size = size;
-  if (name) {
-    size_t length = strlen(name);
-    char* string = lovrMalloc(length + 1);
-    memcpy(string, name, length + 1);
-    blob->name = string;
-  }
+  blob->name = lovrStrdup(name);
   return blob;
 }
 

src/modules/event/event.c

@@ -66,25 +66,13 @@ void lovrEventPush(Event event) {
 #ifndef LOVR_DISABLE_THREAD
   if (event.type == EVENT_THREAD_ERROR) {
     lovrRetain(event.data.thread.thread);
-    size_t length = strlen(event.data.thread.error);
-    char* copy = lovrMalloc(length + 1);
-    memcpy(copy, event.data.thread.error, length + 1);
-    event.data.thread.error = copy;
+    event.data.thread.error = lovrStrdup(event.data.thread.error);
   }
 #endif
 
   if (event.type == EVENT_FILECHANGED) {
-    size_t length = strlen(event.data.file.path);
-    char* copy = lovrMalloc(length + 1);
-    memcpy(copy, event.data.file.path, length + 1);
-    event.data.file.path = copy;
-
-    if (event.data.file.oldpath) {
-      length = strlen(event.data.file.oldpath);
-      copy = lovrMalloc(length + 1);
-      memcpy(copy, event.data.file.oldpath, length + 1);
-      event.data.file.oldpath = copy;
-    }
+    event.data.file.path = lovrStrdup(event.data.file.path);
+    event.data.file.oldpath = lovrStrdup(event.data.file.oldpath);
   }
 
   mtx_lock(&state.lock);

src/modules/filesystem/filesystem.c

@@ -602,10 +602,8 @@ const char* lovrFilesystemGetRequirePath(void) {
 }
 
 void lovrFilesystemSetRequirePath(const char* requirePath) {
-  size_t length = strlen(requirePath);
   lovrFree(state.requirePath);
-  state.requirePath = lovrMalloc(length + 1);
-  memcpy(state.requirePath, requirePath, length + 1);
+  state.requirePath = lovrStrdup(requirePath);
 }
 
 // Archive: dir
@@ -1126,8 +1124,7 @@ File* lovrFileCreate(const char* p, OpenMode mode) {
   file->mode = mode;
   file->handle = handle;
   file->archive = archive;
-  file->path = lovrMalloc(length + 1);
-  memcpy(file->path, path, length + 1);
+  file->path = lovrStrdup(path);
   lovrRetain(archive);
   return file;
 }

src/modules/graphics/graphics.c

@@ -1127,9 +1127,7 @@ static void compilePipeline(void* arg) {
   PipelineJob* job = arg;
   if (!gpu_pipeline_init_graphics(job->pipeline, job->info, NULL)) {
     const char* error = gpu_get_error();
-    size_t length = strlen(error);
-    job->error = lovrMalloc(length + 1);
-    memcpy(job->error, error, length + 1);
+    job->error = lovrStrdup(error);
   }
 }
 
@@ -2420,13 +2418,7 @@ Texture* lovrTextureCreate(const TextureInfo* info) {
   texture->info.mipmaps = mipmaps;
   texture->info.samples = samples;
   texture->info.srgb = srgb;
-
-  if (info->label) {
-    size_t size = strlen(info->label) + 1;
-    char* label = lovrMalloc(size);
-    memcpy(label, info->label, size);
-    texture->info.label = label;
-  }
+  texture->info.label = lovrStrdup(info->label);
 
   uint32_t levelCount = 0;
   uint32_t levelOffsets[16];
@@ -2609,14 +2601,7 @@ Texture* lovrTextureCreateView(Texture* parent, const TextureViewInfo* info) {
   texture->ref = 1;
   texture->gpu = (gpu_texture*) (texture + 1);
   texture->info = *base;
-
-  if (info->label) {
-    size_t size = strlen(info->label) + 1;
-    char* label = lovrMalloc(size);
-    memcpy(label, info->label, size);
-    texture->info.label = label;
-  }
-
+  texture->info.label = lovrStrdup(info->label);
   texture->root = parent->root;
   texture->baseLayer = parent->baseLayer + info->layerIndex;
   texture->baseLevel = parent->baseLevel + info->levelIndex;
@@ -3346,13 +3331,7 @@ Shader* lovrShaderCreate(const ShaderInfo* info) {
   shader->ref = 1;
   shader->gpu = (gpu_shader*) (shader + 1);
   shader->info = *info;
-
-  if (info->label) {
-    size_t size = strlen(info->label) + 1;
-    char* label = lovrMalloc(size);
-    memcpy(label, info->label, size);
-    shader->info.label = label;
-  }
+  shader->info.label = lovrStrdup(info->label);
 
   // Validate stage combinations
   for (uint32_t i = 0; i < info->stageCount; i++) {

src/modules/physics/physics.c

@@ -344,10 +344,8 @@ World* lovrWorldCreate(WorldInfo* info) {
   world->tagCount = info->tagCount;
   world->staticTagMask = info->staticTagMask;
   for (uint32_t i = 0; i < world->tagCount; i++) {
-    size_t length = strlen(info->tags[i]);
-    world->tags[i] = lovrMalloc(length + 1);
-    memcpy(world->tags[i], info->tags[i], length + 1);
-    world->tagLookup[i] = (uint32_t) hash64(info->tags[i], length);
+    world->tags[i] = lovrStrdup(info->tags[i]);
+    world->tagLookup[i] = (uint32_t) hash64(info->tags[i], strlen(info->tags[i]));
   }
 
   uint32_t broadPhaseLayerCount = world->staticTagMask ? 2 : 1;

src/util.h

@@ -27,6 +27,8 @@ void* lovrCalloc(size_t size);
 void* lovrRealloc(void* data, size_t size);
 void lovrFree(void* data);
 
+#define lovrStrdup(s) (s ? memcpy(lovrMalloc(strlen(s) + 1), s, strlen(s) + 1) : NULL)
+
 // Refcounting (to be refcounted, a struct must have a uint32_t refcount as its first field)
 void lovrRetain(void* ref);
 void lovrRelease(void* ref, void (*destructor)(void*));