mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-24 04:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(task_database.c) Refactor away get_ptr function

Browse Source
This commit is contained in:
twinaphex 2015-08-06 04:14:49 +02:00
parent 52c2e76ec8
commit c4ff5e73f1
2 changed files with 4 additions and 13 deletions

15
tasks/task_database.c

@ -479,25 +479,18 @@ do_poll:
} }
} }
void *rarch_main_data_db_get_ptr(void)
{
db_handle_t *db = db_ptr;
if (!db)
return NULL;
return db;
}
void rarch_main_data_db_init_msg_queue(void) void rarch_main_data_db_init_msg_queue(void)
{ {
db_handle_t *db = (db_handle_t*)rarch_main_data_db_get_ptr(); db_handle_t *db = (db_handle_t*)db_ptr;
if (!db->msg_queue) if (!db || !db->msg_queue)
rarch_assert(db->msg_queue = msg_queue_new(8)); rarch_assert(db->msg_queue = msg_queue_new(8));
} }
msg_queue_t *rarch_main_data_db_get_msg_queue_ptr(void) msg_queue_t *rarch_main_data_db_get_msg_queue_ptr(void)
{ {
db_handle_t *db = (db_handle_t*)rarch_main_data_db_get_ptr(); db_handle_t *db = (db_handle_t*)db_ptr;
if (!db) if (!db)
return NULL; return NULL;
return db->msg_queue; return db->msg_queue;
@ -519,7 +512,7 @@ void rarch_main_data_db_init(void)
bool rarch_main_data_db_is_active(void) bool rarch_main_data_db_is_active(void)
{ {
db_handle_t *db = (db_handle_t*)rarch_main_data_db_get_ptr(); db_handle_t *db = (db_handle_t*)db_ptr;
database_info_handle_t *dbi = db ? db->handle : NULL; database_info_handle_t *dbi = db ? db->handle : NULL;
if (dbi && dbi->status != DATABASE_STATUS_NONE) if (dbi && dbi->status != DATABASE_STATUS_NONE)
return true; return true;

2
tasks/tasks.h

@ -79,8 +79,6 @@ bool rarch_main_data_db_pending_scan_finished(void);
void rarch_main_data_db_init_msg_queue(void); void rarch_main_data_db_init_msg_queue(void);
void *rarch_main_data_db_get_ptr(void);
msg_queue_t *rarch_main_data_db_get_msg_queue_ptr(void); msg_queue_t *rarch_main_data_db_get_msg_queue_ptr(void);
void rarch_main_data_db_uninit(void); void rarch_main_data_db_uninit(void);