Remove duplicated conditions

Change-Id: Ia9b557deef1bbc418d16a97e69e63977dbbf243b

diff --git a/include/media_controller_private.h b/include/media_controller_private.h
index 4bac3c2..800c6cb 100644 (file)
--- a/include/media_controller_private.h
+++ b/include/media_controller_private.h
@@ -106,8 +106,16 @@ extern "C" {
                LOGE(fmt" : standard error= [%s]", mc_stderror_buf); \
        } while (0)
 
-#define MC_SAFE_FREE(src)                      { if (src) {free(src); src = NULL; } }
-#define MC_SAFE_G_FREE(src)                    { if (src) {g_free(src); src = NULL; } }
+#define MC_SAFE_FREE(src) do { \
+               if (src) { \
+                       free((void *)src); \
+                       src = NULL; \
+               } \
+       } while (0)
+#define MC_SAFE_G_FREE(src) do { \
+               g_free((gpointer)src); \
+               src = NULL; \
+       } while (0)
 #define MC_SAFE_STRLCPY(dst, src, n)   g_strlcpy(dst, src, n);
 
 #define MC_STRING_VALID(str)                           ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index 5b7a383..394aa11 100644 (file)
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -601,46 +601,50 @@ static gboolean __mc_service_process(gpointer data)
                goto ERROR;
        }
 
-       if (request_msg->msg_type == MC_MSG_DB_UPDATE) {
-               char *query_data = NULL;
-
+       switch (request_msg->msg_type) {
+       case MC_MSG_DB_UPDATE:
                if (!MC_STRING_VALID(request_msg->msg) || request_msg->msg_size == 0) {
-                       mc_error("wrong msg [%zu]", request_msg->msg_size);
+                       mc_error("Invalid message length [%zu]", request_msg->msg_size);
                        send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-               } else {
-                       query_data = strndup(request_msg->msg, request_msg->msg_size);
-                       if (query_data != NULL) {
-                               send_msg = mc_db_parse_and_update_db(request_msg->uid, query_data, request_msg->msg_size);
-                               MC_SAFE_FREE(query_data);
-                       } else {
-                               send_msg = MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
-                       }
+                       break;
                }
-       } else if (request_msg->msg_type == MC_MSG_CLIENT_SET) {
+               send_msg = mc_db_parse_and_update_db(request_msg->uid, request_msg->msg, request_msg->msg_size);
+               break;
+
+       case MC_MSG_CLIENT_SET:
                send_msg = __mc_service_add_cmd_to_send(&(_service_data->connected_apps), request_msg);
-       } else if (request_msg->msg_type == MC_MSG_CLIENT_GET) {
+               break;
+
+       case MC_MSG_CLIENT_GET:
                send_msg = __mc_service_remove_cmd_to_send(&(_service_data->connected_apps), request_msg);
-       } else if (request_msg->msg_type == MC_MSG_SERVER_CONNECTION) {
-               if (MC_STRING_VALID(request_msg->msg)) {
-                       send_msg = __mc_service_add_connection(&(_service_data->connected_apps), request_msg);
-                       if (send_msg == MEDIA_CONTROLLER_ERROR_NONE)
-                               send_msg = mc_db_add_application(request_msg->uid, request_msg->msg, request_msg->priv_type);
-               } else {
-                       mc_error("Wrong message!");
+               break;
+
+       case MC_MSG_SERVER_CONNECTION:
+               if (!MC_STRING_VALID(request_msg->msg)) {
+                       mc_error("Invalid message!");
                        send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+                       break;
                }
-       } else if (request_msg->msg_type == MC_MSG_SERVER_DISCONNECTION) {
-               if (MC_STRING_VALID(request_msg->msg)) {
-                       send_msg = __mc_service_remove_connection(&(_service_data->connected_apps), request_msg);
-                       if (send_msg == MEDIA_CONTROLLER_ERROR_NONE)
-                               send_msg = mc_db_remove_application(request_msg->uid, request_msg->msg, request_msg->priv_type);
-               } else {
-                       mc_error("Wrong message!");
+               send_msg = __mc_service_add_connection(&(_service_data->connected_apps), request_msg);
+               if (send_msg == MEDIA_CONTROLLER_ERROR_NONE)
+                       send_msg = mc_db_add_application(request_msg->uid, request_msg->msg, request_msg->priv_type);
+               break;
+
+       case MC_MSG_SERVER_DISCONNECTION:
+               if (!MC_STRING_VALID(request_msg->msg)) {
+                       mc_error("Invalid message!");
                        send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+                       break;
                }
-       } else {
-               mc_error("Wrong message type!");
+               send_msg = __mc_service_remove_connection(&(_service_data->connected_apps), request_msg);
+               if (send_msg == MEDIA_CONTROLLER_ERROR_NONE)
+                       send_msg = mc_db_remove_application(request_msg->uid, request_msg->msg, request_msg->priv_type);
+               break;
+
+       default:
+               mc_error("Invalid message type!");
                send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+               break;
        }
 
 ERROR: