Inicio Explorar Axuda
Rexistro Iniciar sesión
Eeems
/
tbp-calc
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0
Explorar o código

Clean up all compile warnings for LLVM

Nathaniel van Diepen %!s(int64=3) %!d(string=hai) anos
pai
476257c7fe
achega
84bd1e4fe4
Modificáronse 6 ficheiros con 32 adicións e 29 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 5 4
      src/lib/object.h
  2. 3 3
      src/lib/scene.c
  3. 1 1
      src/lib/scene.h
  4. 4 3
      src/lib/sprite.h
  5. 9 9
      src/lib/vector.c
  6. 10 9
      src/lib/vector.h

+ 5 - 4
src/lib/object.h
Ver ficheiro 

@@ -8,9 +8,10 @@ typedef struct Scale {
 
     int x;
 
     int y;
 
 } Scale;
 
-typedef void (*Object_func)(struct Object*);
 
-typedef int (*Object_func_int)(struct Object*);
 
-typedef struct Object {
 
+typedef struct Object Object;
 
+typedef void (*Object_func)(Object*);
 
+typedef int (*Object_func_int)(Object*);
 
+struct Object {
 
     int id;
 
     int x;
 
     int y;
 
@@ -24,7 +25,7 @@ typedef struct Object {
 
     Object_func update;
 
     Object_func load;
 
     Object_func free;
 
-} Object;
 
+};
 
 
 void Object_draw(Object* self);
 
 void free_Object(Object* self);

+ 3 - 3
src/lib/scene.c
Ver ficheiro 

@@ -66,7 +66,7 @@ void free_Scene(Scene* self){
 
     current_scene = NULL;
 
 }
 
 
-Scene* new_Scene(const char* name){
 
+Scene* new_Scene(char* name){
 
     Scene* self = (Scene*)malloc(sizeof(Scene));
 
     if(current_scene != NULL){
 
         free_Scene(current_scene);
 
@@ -74,8 +74,8 @@ Scene* new_Scene(const char* name){
 
     current_scene = self;
 
     self->name = name;
 
     Scene_log("Creating scene");
 
-    self->objects = new_Vector(0, sizeof(Object), &free_Object);
 
-    self->sprites = new_Vector(0, sizeof(Sprite), &free_Sprite);
 
+    self->objects = new_Vector(0, sizeof(Object), (vc_vector_deleter*)&free_Object);
 
+    self->sprites = new_Vector(0, sizeof(Sprite), (vc_vector_deleter*)&free_Sprite);
 
     self->add_object = &Scene_add_object;
 
     self->add_sprite = &Scene_add_sprite;
 
     self->update = &Scene_update;

+ 1 - 1
src/lib/scene.h
Ver ficheiro 

@@ -22,7 +22,7 @@ struct Scene {
 
 };
 
 
 void free_Scene(Scene* self);
 
-Scene* new_Scene(const char* name);
 
+Scene* new_Scene(char* name);
 
 Scene* current_Scene();
 
 
 #endif

+ 4 - 3
src/lib/sprite.h
Ver ficheiro 

@@ -3,14 +3,15 @@
 
 
 #include <graphx.h>
 
 
-typedef void (*Sprite_func_resize)(struct Sprite*, int, int);
 
-typedef struct Sprite {
 
+typedef struct Sprite Sprite;
 
+typedef void (*Sprite_func_resize)(Sprite*, int, int);
 
+struct Sprite {
 
     int width;
 
     int height;
 
     gfx_sprite_t* data;
 
 
     Sprite_func_resize resize;
 
-} Sprite;
 
+};
 
 
 void free_Sprite(Sprite* self);
 
 Sprite* new_Sprite(int width, int height, void* compressed_data);

+ 9 - 9
src/lib/vector.c
Ver ficheiro 

@@ -5,20 +5,20 @@
 
 #define Vector_log(msg) dbg_sprintf(dbgout, "[Vector] %s\n", msg)
 
 
 
-bool Vector_consume(struct Vector* self, const void* value){
 
+bool Vector_consume(Vector* self, const void* value){
 
     bool success = vc_vector_push_back(self->_vector, value);
 
-    free(value);
 
+    free((void*)value);
 
     if(!success){
 
         Vector_log("Faield to consume value");
 
     }
 
     return success;
 
 }
 
 
-bool Vector_push(struct Vector* self, const void* value){
 
+bool Vector_push(Vector* self, const void* value){
 
     return vc_vector_push_back(self->_vector, value);
 
 }
 
 
-void* Vector_pop(struct Vector* self){
 
+void* Vector_pop(Vector* self){
 
     void* item = vc_vector_end(self->_vector);
 
     if(vc_vector_pop_back(self->_vector)){
 
         return NULL;
 
@@ -26,19 +26,19 @@ void* Vector_pop(struct Vector* self){
 
     return item;
 
 }
 
 
-bool Vector_replace(struct Vector* self, size_t i, const void* value){
 
+bool Vector_replace(Vector* self, size_t i, const void* value){
 
     return vc_vector_replace(self->_vector, i, value);
 
 }
 
 
-void Vector_clear(struct Vector* self){
 
+void Vector_clear(Vector* self){
 
     vc_vector_clear(self->_vector);
 
 }
 
 
-size_t Vector_count(struct Vector* self){
 
+size_t Vector_count(Vector* self){
 
     return self->_vector->count;
 
 }
 
 
-void free_Vector(struct Vector* self){
 
+void free_Vector(Vector* self){
 
     Vector_log("Freeing vc_vector");
 
     self->clear(self);
 
     free(self->_vector);
 
@@ -68,6 +68,6 @@ Vector* new_VectorFromVC(vc_vector* vector){
 
     return self;
 
 }
 
 
-Vector* copy_Vector(struct Vector* vector){
 
+Vector* copy_Vector(Vector* vector){
 
     return new_VectorFromVC(vc_vector_create_copy(vector->_vector));
 
 }

+ 10 - 9
src/lib/vector.h
Ver ficheiro 

@@ -3,14 +3,15 @@
 
 
 #include "vc_vector.h"
 
 
-typedef bool (*Vector_func_push)(struct Vector*, const void*);
 
-typedef bool (*Vector_func_replace)(struct Vector*, size_t, const void*);
 
-typedef void* (*Vector_func_pop)(struct Vector*);
 
-typedef void (*Vector_func)(struct Vector*);
 
-typedef size_t (*Vector_func_count)(struct Vector*);
 
-typedef void* (*Vector_func_get)(struct Vector*, size_t i);
 
+typedef struct Vector Vector;
 
+typedef bool (*Vector_func_push)(Vector*, const void*);
 
+typedef bool (*Vector_func_replace)(Vector*, size_t, const void*);
 
+typedef void* (*Vector_func_pop)(Vector*);
 
+typedef void (*Vector_func)(Vector*);
 
+typedef size_t (*Vector_func_count)(Vector*);
 
+typedef void* (*Vector_func_get)(Vector*, size_t i);
 
 
-typedef struct Vector {
 
+struct Vector {
 
     vc_vector* _vector;
 
 
     Vector_func_push consume;
 
@@ -20,9 +21,9 @@ typedef struct Vector {
 
     Vector_func clear;
 
     Vector_func_count count;
 
     Vector_func_get get;
 
-} Vector;
 
+};
 
 
-void free_Vector(struct Vector* self);
 
+void free_Vector(Vector* self);
 
 Vector* new_Vector(int size, size_t obj_size, vc_vector_deleter* deleter);
 
 Vector* new_VectorFromVC(vc_vector* vector);
 
 #endif