mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor away rarch_main_data_nbio_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-08-06 04:01:44 +02:00
parent 6b261aad87
commit 2ea5dda564
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tasks/task_file_transfer.c
View File

@ -80,15 +80,9 @@ typedef struct nbio_handle
static nbio_handle_t *nbio_ptr; static nbio_handle_t *nbio_ptr;
void *rarch_main_data_nbio_get_ptr(void)
{
return nbio_ptr;
}
msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void) msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return NULL; return NULL;
return nbio->msg_queue; return nbio->msg_queue;
@ -96,8 +90,7 @@ msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void)
void *rarch_main_data_nbio_get_handle(void) void *rarch_main_data_nbio_get_handle(void)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return NULL; return NULL;
return nbio->handle; return nbio->handle;
@ -105,8 +98,7 @@ void *rarch_main_data_nbio_get_handle(void)
msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void) msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return NULL; return NULL;
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
@ -118,8 +110,7 @@ msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void)
void *rarch_main_data_nbio_image_get_handle(void) void *rarch_main_data_nbio_image_get_handle(void)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return NULL; return NULL;
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
@ -354,8 +345,7 @@ static int rarch_main_data_image_iterate_transfer_parse(nbio_handle_t *nbio)
void rarch_main_data_nbio_image_iterate(bool is_thread) void rarch_main_data_nbio_image_iterate(bool is_thread)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
nbio_image_handle_t *image = nbio ? &nbio->image : NULL; nbio_image_handle_t *image = nbio ? &nbio->image : NULL;
if (!image || !nbio) if (!image || !nbio)
@ -389,8 +379,7 @@ void rarch_main_data_nbio_image_iterate(bool is_thread)
void rarch_main_data_nbio_image_upload_iterate(bool is_thread) void rarch_main_data_nbio_image_upload_iterate(bool is_thread)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
nbio_image_handle_t *image = nbio ? &nbio->image : NULL; nbio_image_handle_t *image = nbio ? &nbio->image : NULL;
if (!image || !nbio) if (!image || !nbio)
@ -628,8 +617,7 @@ static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
void rarch_main_data_nbio_iterate(bool is_thread) void rarch_main_data_nbio_iterate(bool is_thread)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return; return;
@ -657,8 +645,7 @@ void rarch_main_data_nbio_iterate(bool is_thread)
void rarch_main_data_nbio_init_msg_queue(void) void rarch_main_data_nbio_init_msg_queue(void)
{ {
nbio_handle_t *nbio = (nbio_handle_t*) nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr;
rarch_main_data_nbio_get_ptr();
if (!nbio) if (!nbio)
return; return;

2
tasks/tasks.h
View File

@ -37,8 +37,6 @@ msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void);
msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void); msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void);
void *rarch_main_data_nbio_get_ptr(void);
void *rarch_main_data_nbio_get_handle(void); void *rarch_main_data_nbio_get_handle(void);
void *rarch_main_data_nbio_image_get_handle(void); void *rarch_main_data_nbio_image_get_handle(void);