From c4ff5e73f1b41e149cad6d3fcaf7fd946211a8cc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 6 Aug 2015 04:14:49 +0200 Subject: [PATCH] (task_database.c) Refactor away get_ptr function --- tasks/task_database.c | 15 ++++----------- tasks/tasks.h | 2 -- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tasks/task_database.c b/tasks/task_database.c index d9edcdcac1..099a9d6b0b 100644 --- a/tasks/task_database.c +++ b/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) { - 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)); } 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) return NULL; return db->msg_queue; @@ -519,7 +512,7 @@ void rarch_main_data_db_init(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; if (dbi && dbi->status != DATABASE_STATUS_NONE) return true; diff --git a/tasks/tasks.h b/tasks/tasks.h index 3342ba55db..3f46225d62 100644 --- a/tasks/tasks.h +++ b/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_get_ptr(void); - msg_queue_t *rarch_main_data_db_get_msg_queue_ptr(void); void rarch_main_data_db_uninit(void);