diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c index 9ad2274918..2384f7b434 100644 --- a/tasks/task_file_transfer.c +++ b/tasks/task_file_transfer.c @@ -80,15 +80,9 @@ typedef struct nbio_handle 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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return NULL; 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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return NULL; 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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return NULL; #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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return NULL; #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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; nbio_image_handle_t *image = nbio ? &nbio->image : NULL; 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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; nbio_image_handle_t *image = nbio ? &nbio->image : NULL; 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) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return; @@ -657,8 +645,7 @@ void rarch_main_data_nbio_iterate(bool is_thread) void rarch_main_data_nbio_init_msg_queue(void) { - nbio_handle_t *nbio = (nbio_handle_t*) - rarch_main_data_nbio_get_ptr(); + nbio_handle_t *nbio = (nbio_handle_t*)nbio_ptr; if (!nbio) return; diff --git a/tasks/tasks.h b/tasks/tasks.h index 15aff14076..90bb3577ac 100644 --- a/tasks/tasks.h +++ b/tasks/tasks.h @@ -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); -void *rarch_main_data_nbio_get_ptr(void); - void *rarch_main_data_nbio_get_handle(void); void *rarch_main_data_nbio_image_get_handle(void);