mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-05-10 08:28:48 +02:00
parent 58ae02207f
commit a4ccfc4d96
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tasks/task_image.c
View File

@ -345,27 +345,18 @@ bool rarch_task_image_load_handler(retro_task_t *task)
bool rarch_task_push_image_load(const char *fullpath, bool rarch_task_push_image_load(const char *fullpath,
const char *type, retro_task_callback_t cb, void *user_data) const char *type, retro_task_callback_t cb, void *user_data)
{ {
#if defined(HAVE_RPNG) && defined(HAVE_MENU) nbio_handle_t *nbio = NULL;
nbio_handle_t *nbio = NULL; retro_task_t *t = NULL;
retro_task_t *t = NULL; uint32_t cb_type_hash = djb2_calculate(type);
uint32_t cb_type_hash = 0; struct nbio_t *handle = nbio_open(fullpath, NBIO_READ);
struct nbio_t* handle = NULL;
cb_type_hash = djb2_calculate(type);
handle = nbio_open(fullpath, NBIO_READ);
if (!handle) if (!handle)
{ goto error;
RARCH_ERR("[image load] Failed to open '%s': %s.\n",
fullpath, strerror(errno));
return false;
}
nbio = (nbio_handle_t*)calloc(1, sizeof(*nbio)); nbio = (nbio_handle_t*)calloc(1, sizeof(*nbio));
if (!nbio) if (!nbio)
return false; goto error;
nbio->handle = handle; nbio->handle = handle;
nbio->is_finished = false; nbio->is_finished = false;
@ -392,10 +383,7 @@ bool rarch_task_push_image_load(const char *fullpath,
t = (retro_task_t*)calloc(1, sizeof(*t)); t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t) if (!t)
{ goto error;
free(nbio);
return false;
}
t->state = nbio; t->state = nbio;
t->handler = rarch_task_file_load_handler; t->handler = rarch_task_file_load_handler;
@ -403,8 +391,17 @@ bool rarch_task_push_image_load(const char *fullpath,
t->user_data = user_data; t->user_data = user_data;
task_queue_ctl(TASK_QUEUE_CTL_PUSH, t); task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
#endif
return true; return true;
error:
if (t)
free(t);
if (nbio)
free(nbio);
RARCH_ERR("[image load] Failed to open '%s': %s.\n",
fullpath, strerror(errno));
return false;
} }