From 90e67772e09a3006f14fb40b9d75f36fc9842945 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Tue, 1 Dec 2015 12:03:34 +0100 Subject: [PATCH] Resolved warnings, and removed duplicated function. --- src/game.c | 2 +- src/util/util.c | 2 +- src/windows/loadsave.c | 15 +++------------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/game.c b/src/game.c index 2f8d571e68..4054e1e4ba 100644 --- a/src/game.c +++ b/src/game.c @@ -1050,7 +1050,7 @@ void save_game() } void save_game_as() { - window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, path_get_filename(gScenarioSavePath)); + window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, (char*)path_get_filename(gScenarioSavePath)); } diff --git a/src/util/util.c b/src/util/util.c index 9bc17d235f..b75e1ef198 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -75,7 +75,7 @@ const char *path_get_filename(const utf8 *path) const char *path_get_extension(const utf8 *path) { // Get the filename from the path - char *filename = path_get_filename(path); + const char *filename = path_get_filename(path); // Try to find the most-right dot in the filename char *extension = strrchr(filename, '.'); diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index 224a576600..aee206274d 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -573,15 +573,6 @@ static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i } } -static int compare_string_case_insensitive(char const *a, char const *b) -{ - for (;; a++, b++) { - int d = tolower(*a) - tolower(*b); - if (d != 0 || !*a) - return d; - } -} - static int list_item_sort(const void *a, const void *b) { const loadsave_list_item *itemA = (loadsave_list_item*)a; @@ -592,15 +583,15 @@ static int list_item_sort(const void *a, const void *b) switch (gConfigGeneral.load_save_sort){ case SORT_NAME_ASCENDING: - return compare_string_case_insensitive(itemA->name, itemB->name); + return strcicmp(itemA->name, itemB->name); case SORT_NAME_DESCENDING: - return -compare_string_case_insensitive(itemA->name, itemB->name); + return -strcicmp(itemA->name, itemB->name); case SORT_DATE_DESCENDING: return (int) -difftime(itemA->date_modified, itemB->date_modified); case SORT_DATE_ASCENDING: return (int) difftime(itemA->date_modified, itemB->date_modified); default: - return compare_string_case_insensitive(itemA->name, itemB->name); + return strcicmp(itemA->name, itemB->name); } }