From 7bd021c515658c2a4d787d720e4d94bca776c5fc Mon Sep 17 00:00:00 2001 From: kts Date: Thu, 20 Nov 2014 19:04:20 -0800 Subject: [PATCH] Fixed various warnings and removed unneeded debugging prints --- src/ktkMap.c | 5 ++--- src/ktkProgram.c | 2 ++ src/ktkStructure.c | 4 +--- src/ktkStructure.h | 2 ++ src/main.c | 1 + src/sdl_main.c | 1 + 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ktkMap.c b/src/ktkMap.c index 8da273a..e2d78be 100644 --- a/src/ktkMap.c +++ b/src/ktkMap.c @@ -2,6 +2,7 @@ #include // malloc #include // printf, remove #include // round +#include // memcpy /* ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, const declarations, etc. @@ -168,6 +169,7 @@ int ktk_copyMapSection(struct ktkMap *map_1, int x0, int y0, struct ktkMap *map_ } mx++; } + return 0; } int ktk_mergeMaps(struct ktkMap *map_1, struct ktkMap *map_2) { @@ -339,9 +341,6 @@ int ktk_fillEllipseBorder(struct ktkMap *map, int r_x, int r_y) { r_x /= 2; r_y /= 2; - int hw = r_x; - int hh = r_y; - int o_x = 0; int o_y = 0; diff --git a/src/ktkProgram.c b/src/ktkProgram.c index fd181f2..1078977 100644 --- a/src/ktkProgram.c +++ b/src/ktkProgram.c @@ -1,6 +1,7 @@ #include "ktkProgram.h" #include #include +#include int ktk_current_depth = 0; @@ -235,6 +236,7 @@ struct ktkLive *ktk_buildStructure(struct ktkProgram *program, struct ktkLive *l free(live); return NULL; } + return 0; } int ktk_linkStructures(struct ktkProgram *program, struct ktkLive *live, struct ktkLive *new_live, struct ktkMap *orig_map) { diff --git a/src/ktkStructure.c b/src/ktkStructure.c index 8ccd57e..3b58ea8 100644 --- a/src/ktkStructure.c +++ b/src/ktkStructure.c @@ -39,7 +39,6 @@ int ktk_getRandom(int min, int max) { } int ktk_rollNumber(struct ktkNumber number) { - int numb = ktk_getRandom(number.a, number.b); return (ktk_getRandom(number.a, number.b)); if (number.type == ktk_PERCENT) { @@ -55,7 +54,7 @@ int ktk_deleteNumberSet(struct ktkNumberSet *set) { if (set->sets != NULL) { free(set->sets); set->sets = NULL; - set->count = NULL; + set->count = 0; } return 0; } @@ -274,7 +273,6 @@ int ktk_deleteLive(struct ktkLive *live) { } int ktk_addLiveChild(struct ktkLive *parent, struct ktkLive *child) { - printf("%d\n", parent->child_count); parent->child_count++; parent->children = realloc(parent->children, parent->child_count*sizeof(struct ktkLive*)); parent->children[parent->child_count-1] = child; diff --git a/src/ktkStructure.h b/src/ktkStructure.h index 04e7a28..9294bea 100644 --- a/src/ktkStructure.h +++ b/src/ktkStructure.h @@ -65,6 +65,8 @@ struct ktkStructure { struct ktkPath *paths; // paths size_t path_count; // count of paths }; extern const struct ktkStructure ktk_STRUCTURE_DEFAULT; + +int ktk_deleteStructure(struct ktkStructure *structure); void ktk_dumpStructure(struct ktkStructure *structure); // live structures are similar to structures, but contain the resulting Structure struct ktkLive { diff --git a/src/main.c b/src/main.c index ba889e7..1bd4377 100644 --- a/src/main.c +++ b/src/main.c @@ -2,6 +2,7 @@ #include "ktk_parse.h" #include "ktkProgram.h" #include +#include int main(int argc, char *argv[]) { ktk_randomizeSeed(); diff --git a/src/sdl_main.c b/src/sdl_main.c index 787f5a4..8e641fd 100644 --- a/src/sdl_main.c +++ b/src/sdl_main.c @@ -44,6 +44,7 @@ int drawMap(struct ktkMap *map) { SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, red, green, blue)); } } + return 0; } #if defined(__APPLE__) && defined(__MACH__)