From: jiyong.min <jiyong.min@samsung.com>
Date: Fri, 22 Mar 2019 01:21:35 +0000 (+0900)
Subject: Rearrange the code for error case
X-Git-Tag: accepted/tizen/unified/20190326.073430^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=455d8169c0f430951bee21eec27400e875bdb288;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Rearrange the code for error case

Change-Id: Ib88f5347b96d133f9b5bcbe4eddc8848edd26f9c
---

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index 44dd9c1..81dfa42 100644
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -85,10 +85,8 @@ static void __mc_destroy_data_list(gpointer data)
 static void __mc_destroy_connected_list(gpointer data)
 {
 	mc_list_data_set_t *_ptr = (mc_list_data_set_t *)data;
-	if (_ptr == NULL) {
-		mc_error("invalid parameter");
-		return;
-	}
+	mc_retm_if(!data, "invalid data");
+
 	if (_ptr->s_data != NULL) {
 		g_list_free_full(_ptr->s_data, __mc_destroy_data_list);
 		_ptr->s_data = NULL;
@@ -99,14 +97,11 @@ static void __mc_destroy_connected_list(gpointer data)
 static int __mc_create_request_queue(mc_manage_queue_t **data)
 {
 	mc_manage_queue_t *_request = (mc_manage_queue_t *)calloc(1, sizeof(mc_manage_queue_t));
-	if (_request == NULL) {
-		mc_error("Failed to create queue manager");
-		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
-	}
+	mc_retvm_if(!_request, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "Failed to create queue manager");
 
 	_request->queue = g_queue_new();
 
-	if (_request->queue == NULL) {
+	if (!_request->queue) {
 		mc_error("Failed to create new queue");
 		MC_SAFE_FREE(_request);
 		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
@@ -119,15 +114,13 @@ static int __mc_create_request_queue(mc_manage_queue_t **data)
 
 static void __mc_destroy_request_queue(mc_manage_queue_t *data)
 {
-	if (data == NULL) {
-		mc_error("invalid parameter");
-		return;
-	}
-	if (data->queue != NULL) {
+	mc_retm_if(!data, "invalid data");
+
+	if (data->queue) {
 		g_queue_free_full(data->queue, __mc_destroy_queue);
 		data->queue = NULL;
 	}
-	if (data->source != NULL) {
+	if (data->source) {
 		g_source_unref(data->source);
 		data->source = NULL;
 	}
@@ -218,10 +211,7 @@ static int _mc_service_init(mc_service_t **data)
 {
 	int res = MEDIA_CONTROLLER_ERROR_NONE;
 	mc_service_t *_service_data = (mc_service_t *)calloc(1, sizeof(mc_service_t));
-	if (_service_data == NULL) {
-		mc_error("Failed to allocate service data");
-		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
-	}
+	mc_retvm_if(!_service_data, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "Failed to allocate service data");
 
 	res = __mc_create_request_queue(&(_service_data->request));
 	if (res != MEDIA_CONTROLLER_ERROR_NONE) {
@@ -372,10 +362,7 @@ static int _mc_service_add_connection(GList **connected_list, mc_comm_msg_s *req
 	}
 
 	data = (mc_list_data_set_t *)calloc(1, sizeof(mc_list_data_set_t));
-	if (data == NULL) {
-		mc_error("memory allocation is failed");
-		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
-	}
+	mc_retvm_if(!data, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "memory allocation is failed");
 
 	data->uid = request_msg->uid;
 	data->pid = request_msg->pid;
@@ -424,8 +411,7 @@ static int _mc_service_set_data(GList **connected_list, mc_comm_msg_s *request_m
 static int _mc_service_get_data(GList **connected_list, mc_comm_msg_s *request_msg)
 {
 	mc_list_user_data *user_data = calloc(1, sizeof(mc_list_user_data));
-	if (user_data == NULL)
-		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
+	mc_retvm_if(!user_data, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "memory allocation is failed");
 
 	user_data->message = request_msg;
 	user_data->result = 0;
@@ -538,15 +524,9 @@ gboolean _mc_service_process(gpointer data)
 	int send_msg = MEDIA_CONTROLLER_ERROR_NONE;
 	mc_service_t *_service_data = (mc_service_t*)data;
 
-	if (_service_data == NULL) {
-		mc_debug("invalid service_data");
-		return FALSE;
-	}
+	mc_retvm_if(!_service_data, FALSE, "invalid data");
+	mc_retvm_if(!_mc_service_is_valid_queue(_service_data), FALSE, "invalid queue");
 
-	if (_mc_service_is_valid_queue(_service_data) == FALSE) {
-		mc_debug("invalid queue");
-		return FALSE;
-	}
 	GQueue *request_queue = _service_data->request->queue;
 	length_of_queue = g_queue_get_length(request_queue);