From d2e0642b59c8fe291082f3f6e28543e47b98559b Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Wed, 21 Mar 2018 12:56:16 -0700
Subject: [PATCH] Use calloc in lovrAlloc;

---
 src/audio/source.c      |  1 -
 src/data/blob.c         |  1 -
 src/data/modelData.c    |  3 ---
 src/data/textureData.c  |  3 ---
 src/data/vertexData.c   |  5 ++---
 src/filesystem/file.c   |  1 -
 src/graphics/canvas.c   |  4 ----
 src/graphics/font.c     |  1 -
 src/graphics/material.c |  4 ----
 src/graphics/mesh.c     | 15 ---------------
 src/graphics/model.c    |  8 --------
 src/graphics/texture.c  |  1 -
 src/thread/channel.c    |  2 --
 src/util.c              |  2 +-
 14 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/src/audio/source.c b/src/audio/source.c
index 8f9592b5..39a677f2 100644
--- a/src/audio/source.c
+++ b/src/audio/source.c
@@ -32,7 +32,6 @@ Source* lovrSourceCreate(AudioStream* stream) {
   if (!source) return NULL;
 
   source->stream = stream;
-  source->isLooping = false;
   alGenSources(1, &source->id);
   alGenBuffers(SOURCE_BUFFERS, source->buffers);
   lovrRetain(stream);
diff --git a/src/data/blob.c b/src/data/blob.c
index bf7241a3..f4ec325d 100644
--- a/src/data/blob.c
+++ b/src/data/blob.c
@@ -7,7 +7,6 @@ Blob* lovrBlobCreate(void* data, size_t size, const char* name) {
   blob->data = data;
   blob->size = size;
   blob->name = name;
-  blob->seek = 0;
 
   return blob;
 }
diff --git a/src/data/modelData.c b/src/data/modelData.c
index 1047017e..131a2106 100644
--- a/src/data/modelData.c
+++ b/src/data/modelData.c
@@ -266,9 +266,6 @@ ModelData* lovrModelDataCreate(Blob* blob) {
     lovrThrow("Unable to load model from '%s': %s\n", blob->name, aiGetErrorString());
   }
 
-  modelData->nodeCount = 0;
-  modelData->indexCount = 0;
-
   uint32_t vertexCount = 0;
   bool hasNormals = false;
   bool hasUVs = false;
diff --git a/src/data/textureData.c b/src/data/textureData.c
index 76ebf246..b1337406 100644
--- a/src/data/textureData.c
+++ b/src/data/textureData.c
@@ -135,7 +135,6 @@ TextureData* lovrTextureDataGetBlank(int width, int height, uint8_t value, Textu
   textureData->format = format;
   textureData->blob.size = size;
   textureData->blob.data = memset(malloc(size), value, size);
-  textureData->source = NULL;
   vec_init(&textureData->mipmaps);
   return textureData;
 }
@@ -149,7 +148,6 @@ TextureData* lovrTextureDataGetEmpty(int width, int height, TextureFormat format
   textureData->height = height;
   textureData->format = format;
   textureData->blob.data = NULL;
-  textureData->source = NULL;
   vec_init(&textureData->mipmaps);
   return textureData;
 }
@@ -169,7 +167,6 @@ TextureData* lovrTextureDataFromBlob(Blob* blob) {
   stbi_set_flip_vertically_on_load(1);
   textureData->format = FORMAT_RGBA;
   textureData->blob.data = stbi_load_from_memory(blob->data, blob->size, &textureData->width, &textureData->height, NULL, 4);
-  textureData->source = NULL;
 
   if (!textureData->blob.data) {
     lovrThrow("Could not load texture data from '%s'", blob->name);
diff --git a/src/data/vertexData.c b/src/data/vertexData.c
index d0c5daea..3b603ac8 100644
--- a/src/data/vertexData.c
+++ b/src/data/vertexData.c
@@ -19,6 +19,8 @@ VertexData* lovrVertexDataCreate(uint32_t count, VertexFormat* format, bool allo
   VertexData* vertexData = lovrAlloc(sizeof(VertexData), lovrBlobDestroy);
   if (!vertexData) return NULL;
 
+  vertexData->count = count;
+
   if (format) {
     vertexData->format = *format;
   } else {
@@ -30,9 +32,6 @@ VertexData* lovrVertexDataCreate(uint32_t count, VertexFormat* format, bool allo
     vertexFormatAppend(&vertexData->format, "lovrVertexColor", ATTR_BYTE, 4);
   }
 
-  vertexData->count = count;
-  vertexData->blob.data = NULL;
-
   if (allocate) {
     size_t size = format->stride * count;
     vertexData->blob.data = calloc(1, size);
diff --git a/src/filesystem/file.c b/src/filesystem/file.c
index c694b4c4..0a3ec735 100644
--- a/src/filesystem/file.c
+++ b/src/filesystem/file.c
@@ -6,7 +6,6 @@ File* lovrFileCreate(const char* path) {
   if (!file) return NULL;
 
   file->path = path;
-  file->handle = NULL;
 
   return file;
 }
diff --git a/src/graphics/canvas.c b/src/graphics/canvas.c
index 50116fd0..9740323a 100644
--- a/src/graphics/canvas.c
+++ b/src/graphics/canvas.c
@@ -27,10 +27,6 @@ Canvas* lovrCanvasCreate(int width, int height, TextureFormat format, int msaa,
   Canvas* canvas = lovrAlloc(sizeof(Canvas), lovrCanvasDestroy);
   canvas->texture = *texture;
   canvas->msaa = msaa;
-  canvas->framebuffer = 0;
-  canvas->resolveFramebuffer = 0;
-  canvas->depthStencilBuffer = 0;
-  canvas->msaaTexture = 0;
 
   // Framebuffer
   glGenFramebuffers(1, &canvas->framebuffer);
diff --git a/src/graphics/font.c b/src/graphics/font.c
index bf15b2d6..f4c87f67 100644
--- a/src/graphics/font.c
+++ b/src/graphics/font.c
@@ -28,7 +28,6 @@ Font* lovrFontCreate(Rasterizer* rasterizer) {
 
   lovrRetain(rasterizer);
   font->rasterizer = rasterizer;
-  font->texture = NULL;
   font->lineHeight = 1.f;
   font->pixelDensity = (float) font->rasterizer->height;
   map_init(&font->kerning);
diff --git a/src/graphics/material.c b/src/graphics/material.c
index bca87210..5a6a52c3 100644
--- a/src/graphics/material.c
+++ b/src/graphics/material.c
@@ -15,10 +15,6 @@ Material* lovrMaterialCreate(bool isDefault) {
     material->colors[i] = (Color) { 1, 1, 1, 1 };
   }
 
-  for (int i = 0; i < MAX_MATERIAL_TEXTURES; i++) {
-    material->textures[i] = NULL;
-  }
-
   return material;
 }
 
diff --git a/src/graphics/mesh.c b/src/graphics/mesh.c
index b43b9937..66999e83 100644
--- a/src/graphics/mesh.c
+++ b/src/graphics/mesh.c
@@ -72,22 +72,9 @@ Mesh* lovrMeshCreate(VertexData* vertexData, MeshDrawMode drawMode, MeshUsage us
 
   uint32_t count = vertexData->count;
   mesh->vertexData = vertexData;
-  mesh->indices.raw = NULL;
-  mesh->indexCount = 0;
   mesh->indexSize = count > USHRT_MAX ? sizeof(uint32_t) : sizeof(uint16_t);
-  mesh->isMapped = false;
-  mesh->mapStart = 0;
-  mesh->mapCount = 0;
-  mesh->isRangeEnabled = false;
-  mesh->rangeStart = 0;
-  mesh->rangeCount = count;
   mesh->drawMode = drawMode;
   mesh->usage = usage;
-  mesh->vao = 0;
-  mesh->vbo = 0;
-  mesh->ibo = 0;
-  mesh->material = NULL;
-  mesh->isAttachment = false;
 
   glGenBuffers(1, &mesh->vbo);
   glGenBuffers(1, &mesh->ibo);
@@ -101,8 +88,6 @@ Mesh* lovrMeshCreate(VertexData* vertexData, MeshDrawMode drawMode, MeshUsage us
     map_set(&mesh->attachments, vertexData->format.attributes[i].name, attachment);
   }
 
-  memset(mesh->layout, 0, MAX_ATTACHMENTS * sizeof(MeshAttachment));
-
   return mesh;
 }
 
diff --git a/src/graphics/model.c b/src/graphics/model.c
index d528b25e..25d28140 100644
--- a/src/graphics/model.c
+++ b/src/graphics/model.c
@@ -56,8 +56,6 @@ Model* lovrModelCreate(ModelData* modelData) {
   lovrRetain(modelData);
   model->modelData = modelData;
   model->aabbDirty = true;
-  model->animator = NULL;
-  model->material = NULL;
 
   model->mesh = lovrMeshCreate(modelData->vertexData, MESH_TRIANGLES, MESH_STATIC);
   VertexPointer vertices = lovrMeshMap(model->mesh, 0, modelData->vertexData->count, false, true);
@@ -71,12 +69,8 @@ Model* lovrModelCreate(ModelData* modelData) {
     for (int i = 0; i < modelData->textures.length; i++) {
       if (modelData->textures.data[i]) {
         model->textures[i] = lovrTextureCreate(TEXTURE_2D, (TextureData**) &modelData->textures.data[i], 1, i == 2, true);
-      } else {
-        model->textures[i] = NULL;
       }
     }
-  } else {
-    model->textures = NULL;
   }
 
   if (modelData->materialCount > 0) {
@@ -96,8 +90,6 @@ Model* lovrModelCreate(ModelData* modelData) {
       lovrMaterialSetTexture(material, TEXTURE_NORMAL, model->textures[materialData->normalTexture]);
       model->materials[i] = material;
     }
-  } else {
-    model->materials = NULL;
   }
 
   for (int i = 0; i < MAX_BONES; i++) {
diff --git a/src/graphics/texture.c b/src/graphics/texture.c
index c43bae4f..5cce6eb0 100644
--- a/src/graphics/texture.c
+++ b/src/graphics/texture.c
@@ -92,7 +92,6 @@ Texture* lovrTextureCreate(TextureType type, TextureData** slices, int sliceCoun
   texture->sliceCount = sliceCount;
   texture->srgb = srgb;
   texture->mipmaps = mipmaps;
-  texture->allocated = false;
 
   WrapMode wrap = type == TEXTURE_CUBE ? WRAP_CLAMP : WRAP_REPEAT;
   glGenTextures(1, &texture->id);
diff --git a/src/thread/channel.c b/src/thread/channel.c
index 9d2aab73..d2d27285 100644
--- a/src/thread/channel.c
+++ b/src/thread/channel.c
@@ -10,8 +10,6 @@ Channel* lovrChannelCreate() {
   vec_init(&channel->messages);
   mtx_init(&channel->lock, mtx_plain | mtx_timed);
   cnd_init(&channel->cond);
-  channel->sent = 0;
-  channel->received = 0;
 
   return channel;
 }
diff --git a/src/util.c b/src/util.c
index 9d68cab3..9b23df33 100644
--- a/src/util.c
+++ b/src/util.c
@@ -35,7 +35,7 @@ void lovrSleep(double seconds) {
 }
 
 void* lovrAlloc(size_t size, void (*destructor)(void* object)) {
-  void* object = malloc(size);
+  void* object = calloc(1, size);
   if (!object) return NULL;
   *((Ref*) object) = (Ref) { destructor, 1 };
   return object;