From 28e2ca74e7cb8da9bb70cf277d67d75553db32ed Mon Sep 17 00:00:00 2001 From: Alcaro Date: Tue, 10 Feb 2015 22:28:08 +0100 Subject: [PATCH 1/5] Double semicolons aren't useful. --- audio/drivers/coreaudio.c | 2 +- deps/7zip/7zDec.c | 2 +- menu/menu_entries_cbs.c | 2 +- ps3/gcmgl/src/rgl_ps3_raster.cpp | 2 +- runloop.c | 2 +- settings_data.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c index 84e09ae8db..371d634fa4 100644 --- a/audio/drivers/coreaudio.c +++ b/audio/drivers/coreaudio.c @@ -258,7 +258,7 @@ static void *coreaudio_init(const char *device, goto error; /* Check returned audio format. */ - i_size = sizeof(real_desc);; + i_size = sizeof(real_desc); if (AudioUnitGetProperty(dev->dev, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &real_desc, &i_size) != noErr) goto error; diff --git a/deps/7zip/7zDec.c b/deps/7zip/7zDec.c index 38ce7e560c..daccc5afc2 100755 --- a/deps/7zip/7zDec.c +++ b/deps/7zip/7zDec.c @@ -58,7 +58,7 @@ static uint8_t Readuint8_t(void *pp) p->cur = p->begin; p->end = p->begin + size; if (size != 0) - return *p->cur++;; + return *p->cur++; } p->extra = True; return 0; diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index 9e0e67e1e2..286191994c 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1054,7 +1054,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, playlist->entries[j].core_name, "|"); if (!str_list) - continue;; + continue; if (str_list && str_list->size > 0) strlcpy(elem0, str_list->elems[0].data, sizeof(elem0)); diff --git a/ps3/gcmgl/src/rgl_ps3_raster.cpp b/ps3/gcmgl/src/rgl_ps3_raster.cpp index 11146cfc12..4c5077457d 100644 --- a/ps3/gcmgl/src/rgl_ps3_raster.cpp +++ b/ps3/gcmgl/src/rgl_ps3_raster.cpp @@ -1259,7 +1259,7 @@ static void update_state_validation(void) gcm_emit_at(gcm_context->current, 7, (((platformTexture->gcmTexture.height) | ((platformTexture->gcmTexture.width) << 16)))); gcm_emit_at(gcm_context->current, 8, ((platformTexture->gcmMethods.borderColor))); gcm_emit_at(gcm_context->current, 9, ((((1) << (18)) | ((CELL_GCM_NV4097_SET_TEXTURE_CONTROL3) + (unit) * 0x04)))); - gcm_emit_at(gcm_context->current, 10, (((platformTexture->gcmTexture.pitch) | ((platformTexture->gcmTexture.depth) << 20))));; + gcm_emit_at(gcm_context->current, 10, (((platformTexture->gcmTexture.pitch) | ((platformTexture->gcmTexture.depth) << 20)))); gcm_finish_n_commands(gcm_context->current, 11); } else diff --git a/runloop.c b/runloop.c index 1f95befffa..ceafd0b734 100644 --- a/runloop.c +++ b/runloop.c @@ -747,7 +747,7 @@ static void check_block_hotkey(bool enable_hotkey) bind->joyaxis != AXIS_NONE || autoconf_bind->key != RETROK_UNKNOWN || autoconf_bind->joykey != NO_BTN || - autoconf_bind->joyaxis != AXIS_NONE;; + autoconf_bind->joyaxis != AXIS_NONE; driver.block_hotkey = driver.block_input || (use_hotkey_enable && !enable_hotkey); diff --git a/settings_data.c b/settings_data.c index 43f6602c56..81250fa8ec 100644 --- a/settings_data.c +++ b/settings_data.c @@ -3636,7 +3636,7 @@ static bool setting_data_append_list_general_options( group_info.name, subgroup_info.name, general_write_handler, - general_read_handler);; + general_read_handler); #ifdef HAVE_THREADS CONFIG_UINT( From 1f36d475566c98b792308cbddc87aaf22a817c0d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Feb 2015 22:31:59 +0100 Subject: [PATCH 2/5] Fix another crash - don't reuse str_list --- menu/menu_entries_cbs.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index 286191994c..dd54fb9e8b 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -849,9 +849,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, database_info_list_t *db_info = NULL; file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - struct string_list *str_list = NULL; - - str_list = string_split(label, "|"); + struct string_list *str_list = string_split(label, "|"); if (!str_list) return -1; @@ -1050,16 +1048,16 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, { char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH]; bool match_found = false; - str_list = string_split( + struct string_list *tmp_str_list = string_split( playlist->entries[j].core_name, "|"); - if (!str_list) + if (!tmp_str_list) continue; - if (str_list && str_list->size > 0) - strlcpy(elem0, str_list->elems[0].data, sizeof(elem0)); - if (str_list && str_list->size > 1) - strlcpy(elem1, str_list->elems[1].data, sizeof(elem1)); + if (tmp_str_list && tmp_str_list->size > 0) + strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0)); + if (tmp_str_list && tmp_str_list->size > 1) + strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1)); if (!strcmp(elem1, "crc")) { @@ -1077,7 +1075,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, match_found = true; } - string_list_free(str_list); + string_list_free(tmp_str_list); if (!match_found) continue; From 3f7adb2903b660f8b56cd764f6e810a06e1f4b21 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Feb 2015 22:34:49 +0100 Subject: [PATCH 3/5] Cleanup conditional mess --- menu/menu_entries_cbs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index dd54fb9e8b..a7506e4df5 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1054,10 +1054,13 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, if (!tmp_str_list) continue; - if (tmp_str_list && tmp_str_list->size > 0) - strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0)); - if (tmp_str_list && tmp_str_list->size > 1) - strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1)); + if (tmp_str_list) + { + if (tmp_str_list->size > 0) + strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0)); + if (tmp_str_list->size > 1) + strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1)); + } if (!strcmp(elem1, "crc")) { From bdaace4da79f6767c823f25c52df8e4e96d1fe45 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Feb 2015 22:36:20 +0100 Subject: [PATCH 4/5] Cleanup action_ok_core_download --- menu/menu_entries_cbs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index a7506e4df5..e954a7d5c7 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1167,13 +1167,6 @@ static int action_ok_core_load(const char *path, static int action_ok_core_download(const char *path, const char *label, unsigned type, size_t idx) { - const char *menu_path = NULL; - if (!driver.menu) - return -1; - - menu_list_get_last_stack(driver.menu->menu_list, - &menu_path, NULL, NULL); - return 0; } From 28405f547b11bd3f67312da683b756669a55f3ec Mon Sep 17 00:00:00 2001 From: Alcaro Date: Tue, 10 Feb 2015 22:36:39 +0100 Subject: [PATCH 5/5] Cleanup conditional mess --- menu/menu_entries_cbs.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index e954a7d5c7..f6725c08e5 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1054,13 +1054,10 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, if (!tmp_str_list) continue; - if (tmp_str_list) - { - if (tmp_str_list->size > 0) - strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0)); - if (tmp_str_list->size > 1) - strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1)); - } + if (tmp_str_list->size > 0) + strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0)); + if (tmp_str_list->size > 1) + strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1)); if (!strcmp(elem1, "crc")) {