From: hj kim <backto.kim@samsung.com>
Date: Thu, 14 Feb 2019 03:00:51 +0000 (+0900)
Subject: Just code clean up
X-Git-Tag: submit/tizen_5.0/20190404.023255~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=185caeabca204e20619668b37c9875f65fcf1885;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Just code clean up

Change-Id: I596229c75af87d4991989d0f76bceca820f314da
(cherry picked from commit b7ac9bb38db5e3788457900381f3de084846a99b)
---

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index d3c0513..edd33b1 100644
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -324,26 +324,15 @@ int mc_db_util_connect(void **handle, uid_t uid)
 	*handle = NULL;
 
 	db_name = __mc_get_db_name(uid);
-
-	if (db_name == NULL) {
-		mc_error("error when get db path");
-		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-	}
+	mc_retvm_if(db_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "error when get db path");
 
 	/*Connect DB*/
 	ret = sqlite3_open_v2(db_name, &db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
 
 	MC_SAFE_FREE(db_name);
 
-	if (SQLITE_OK != ret) {
-		mc_error("error when db open");
-		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-	}
-
-	if (db_handle == NULL) {
-		mc_error("*db_handle is NULL");
-		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-	}
+	mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "error when db open");
+	mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "db_handle is NULL");
 
 	/*Register busy handler*/
 	ret = sqlite3_busy_handler(db_handle, __mc_db_util_busy_handler, NULL);
@@ -397,10 +386,7 @@ int mc_db_util_get_db_name(uid_t uid, char **db_name)
 {
 	*db_name = __mc_get_db_name(uid);
 
-	if (*db_name == NULL) {
-		mc_error("error when get db path");
-		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-	}
+	mc_retvm_if(*db_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "error when get db path");
 
 	return MEDIA_CONTROLLER_ERROR_NONE;
 }
@@ -446,16 +432,10 @@ int mc_db_util_remove_db(uid_t uid)
 	gboolean result = FALSE;
 	GError *g_error = NULL;
 
-	mc_debug_fenter();
-
-	db_name = __mc_get_db_name(uid);
-
 	mc_warning("The db is abnormal. So it will be removed.");
 
-	if (db_name == NULL) {
-		mc_error("error when get db path");
-		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-	}
+	db_name = __mc_get_db_name(uid);
+	mc_retvm_if(db_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "error when get db path");
 
 	db_file = g_file_new_for_path(db_name);
 	if (db_file == NULL) {
@@ -535,15 +515,8 @@ int mc_db_util_delete_whole_server_tables(void *handle)
 	mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
 	ret = __mc_foreach_table_list(handle, &table_list);
-	if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-		mc_error("Error __mc_foreach_table_list %d", ret);
-		return ret;
-	}
-
-	if (table_list == NULL) {
-		mc_debug("No server list to delete");
-		return ret;
-	}
+	mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error __mc_foreach_table_list %d", ret);
+	mc_retvm_if(table_list == NULL, MEDIA_CONTROLLER_ERROR_NONE, "No server list to delete");
 
 	for (idx = 0; idx < g_list_length(table_list); idx++) {
 		char *table_name = g_list_nth_data(table_list, idx);