ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup task_decompress

This commit is contained in:
twinaphex 2019-05-12 20:17:58 +02:00
parent 0302a8812a
commit ba8f7e3e63
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tasks/task_decompress.c
View File

@ -323,24 +323,28 @@ bool task_push_decompress(
s = (decompress_state_t*)calloc(1, sizeof(*s)); s = (decompress_state_t*)calloc(1, sizeof(*s));
if (!s) if (!s)
goto error; return false;
s->source_file = strdup(source_file); t = (retro_task_t*)calloc(1, sizeof(*t));
s->target_dir = strdup(target_dir);
s->valid_ext = valid_ext ? strdup(valid_ext) : NULL;
s->archive.type = ARCHIVE_TRANSFER_INIT;
s->userdata = (struct archive_extract_userdata*)calloc(1, sizeof(*s->userdata));
t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t) if (!t)
goto error; {
free(s);
return false;
}
t->frontend_userdata = frontend_userdata; s->source_file = strdup(source_file);
s->target_dir = strdup(target_dir);
t->state = s; s->valid_ext = valid_ext ? strdup(valid_ext) : NULL;
t->handler = task_decompress_handler; s->archive.type = ARCHIVE_TRANSFER_INIT;
s->userdata = (struct archive_extract_userdata*)
calloc(1, sizeof(*s->userdata));
t->frontend_userdata= frontend_userdata;
t->state = s;
t->handler = task_decompress_handler;
if (!string_is_empty(subdir)) if (!string_is_empty(subdir))
{ {
@ -353,25 +357,16 @@ bool task_push_decompress(
t->handler = task_decompress_handler_target_file; t->handler = task_decompress_handler_target_file;
} }
t->callback = cb; t->callback = cb;
t->user_data = user_data; t->user_data = user_data;
snprintf(tmp, sizeof(tmp), "%s '%s'", snprintf(tmp, sizeof(tmp), "%s '%s'",
msg_hash_to_str(MSG_EXTRACTING), msg_hash_to_str(MSG_EXTRACTING),
path_basename(source_file)); path_basename(source_file));
t->title = strdup(tmp); t->title = strdup(tmp);
task_queue_push(t); task_queue_push(t);
return true; return true;
error:
if (s)
{
if (s->userdata)
free(s->userdata);
free(s);
}
return false;
} }