CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-08 12:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(task_file_transfer) Fix --disable-zlib builds

Browse Source
This commit is contained in:
Higor Eurípedes 2015-11-23 20:41:01 -03:00
parent 59e66b5755
commit 1d946a1b27
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_deferred_push.c
View File

@ -325,6 +325,7 @@ finish:
} }
} }
#ifdef HAVE_ZLIB
static int zlib_extract_core_callback(const char *name, const char *valid_exts, static int zlib_extract_core_callback(const char *name, const char *valid_exts,
const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size, const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size,
uint32_t crc32, void *userdata) uint32_t crc32, void *userdata)
@ -356,6 +357,7 @@ error:
RARCH_ERR("Failed to deflate to: %s.\n", path); RARCH_ERR("Failed to deflate to: %s.\n", path);
return 0; return 0;
} }
#endif
/* expects http_transfer_t*, menu_file_transfer_t* */ /* expects http_transfer_t*, menu_file_transfer_t* */
void cb_generic_download(void *task_data, void *user_data, const char *err) void cb_generic_download(void *task_data, void *user_data, const char *err)

20
tasks/task_file_transfer.c
View File

@ -78,12 +78,12 @@ typedef struct nbio_handle
unsigned status; unsigned status;
} nbio_handle_t; } nbio_handle_t;
static void rarch_task_file_load_handler(rarch_task_t *task);
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../menu/menu_driver.h" #include "../menu/menu_driver.h"
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
static void rarch_task_file_load_handler(rarch_task_t *task);
static int cb_image_menu_upload_generic(void *data, size_t len) static int cb_image_menu_upload_generic(void *data, size_t len)
{ {
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
@ -230,9 +230,6 @@ static int rarch_main_data_image_iterate_transfer_parse(nbio_handle_t *nbio)
return 0; return 0;
} }
#endif
#endif
static int cb_nbio_default(void *data, size_t len) static int cb_nbio_default(void *data, size_t len)
{ {
@ -248,8 +245,6 @@ static int cb_nbio_default(void *data, size_t len)
return 0; return 0;
} }
#ifdef HAVE_RPNG
#ifdef HAVE_MENU
static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len) static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
{ {
void *ptr = NULL; void *ptr = NULL;
@ -313,9 +308,12 @@ static int cb_nbio_image_menu_boxart(void *data, size_t len)
return cb_nbio_generic(nbio, &len); return cb_nbio_generic(nbio, &len);
} }
#endif
#endif
bool rarch_task_push_image_load(const char *fullpath, const char *type, rarch_task_callback_t cb) bool rarch_task_push_image_load(const char *fullpath, const char *type, rarch_task_callback_t cb)
{ {
#if defined(HAVE_RPNG) && defined(HAVE_MENU)
rarch_task_t *t; rarch_task_t *t;
nbio_handle_t *nbio; nbio_handle_t *nbio;
uint32_t cb_type_hash = 0; uint32_t cb_type_hash = 0;
@ -352,12 +350,12 @@ bool rarch_task_push_image_load(const char *fullpath, const char *type, rarch_ta
t->callback = cb; t->callback = cb;
rarch_task_push(t); rarch_task_push(t);
#endif
return true; return true;
} }
#endif
#endif
/* guarded for rpng/menu use but good for generic use */
#if defined(HAVE_RPNG) && defined(HAVE_MENU)
static int rarch_main_data_nbio_iterate_transfer(nbio_handle_t *nbio) static int rarch_main_data_nbio_iterate_transfer(nbio_handle_t *nbio)
{ {
size_t i; size_t i;
@ -450,7 +448,8 @@ static void rarch_task_file_load_handler(rarch_task_t *task)
goto task_finished; goto task_finished;
} }
} else if (nbio->is_finished) } else
if (nbio->is_finished)
goto task_finished; goto task_finished;
return; return;
@ -472,3 +471,4 @@ task_finished:
nbio->frame_count = 0; nbio->frame_count = 0;
free(nbio); free(nbio);
} }
#endif

2
tasks/tasks.h
View File

@ -73,9 +73,7 @@ typedef struct {
bool rarch_task_push_http_transfer(const char *url, const char *type, rarch_task_callback_t cb, void *user_data); bool rarch_task_push_http_transfer(const char *url, const char *type, rarch_task_callback_t cb, void *user_data);
#endif #endif
#ifdef HAVE_RPNG
bool rarch_task_push_image_load(const char *fullpath, const char *type, rarch_task_callback_t cb); bool rarch_task_push_image_load(const char *fullpath, const char *type, rarch_task_callback_t cb);
#endif
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
bool rarch_task_push_dbscan(const char *fullpath, bool directory, rarch_task_callback_t cb); bool rarch_task_push_dbscan(const char *fullpath, bool directory, rarch_task_callback_t cb);