(tasks) Cleanups

This commit is contained in:
twinaphex 2016-09-29 12:02:45 +02:00
parent dc915713dd
commit cae92ed91d
2 changed files with 10 additions and 8 deletions

View File

@ -496,8 +496,8 @@ static bool load_content(
retro_ctx_load_content_info_t load_info;
struct string_list *additional_path_allocs = string_list_new();
if (!info || !additional_path_allocs)
goto error;
if (!additional_path_allocs)
return false;
for (i = 0; i < content->size; i++)
{
@ -727,8 +727,8 @@ static bool content_file_init(struct string_list *temporary_content)
info = (struct retro_game_info*)
calloc(content->size, sizeof(*info));
ret = load_content(temporary_content,
info, content, special);
if (info)
ret = load_content(temporary_content, info, content, special);
for (i = 0; i < content->size; i++)
free((void*)info[i].data);

View File

@ -145,9 +145,9 @@ static void task_decompress_handler_finished(retro_task_t *task,
static void task_decompress_handler(retro_task_t *task)
{
int ret;
bool retdec = false;
decompress_state_t *dec = (decompress_state_t*)task->state;
bool retdec = false;
struct archive_extract_userdata userdata = {{0}};
decompress_state_t *dec = task ? (decompress_state_t*)task->state : NULL;
userdata.dec = dec;
strlcpy(userdata.archive_path, dec->source_file, sizeof(userdata.archive_path));
@ -171,10 +171,12 @@ static void task_decompress_handler_target_file(retro_task_t *task)
{
bool retdec;
int ret;
decompress_state_t *dec = (decompress_state_t*)task->state;
struct archive_extract_userdata userdata = {{0}};
decompress_state_t *dec = task ?
(decompress_state_t*)task->state : NULL;
strlcpy(userdata.archive_path, dec->source_file, sizeof(userdata.archive_path));
strlcpy(userdata.archive_path,
dec->source_file, sizeof(userdata.archive_path));
ret = file_archive_parse_file_iterate(&dec->archive,
&retdec, dec->source_file,