Unify duplicated code regarding error handling

Change-Id: I85036d0b31671f60345a361df9b3af8efa153711

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index 920f8d9..3849d7b 100644 (file)
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -595,6 +595,12 @@ static gboolean __mc_service_process(gpointer data)
                goto ERROR;
        }
 
+       if (!MC_STRING_VALID(request_msg->msg) || request_msg->msg_size == 0) {
+               mc_error("Invalid message [msg:%s size:%zu]", request_msg->msg, request_msg->msg_size);
+               send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+               goto ERROR;
+       }
+
        if (!__mc_service_is_valid_connection(_service_data->connected_apps, request_msg)) {
                mc_error("Wrong message");
                send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
@@ -603,11 +609,6 @@ static gboolean __mc_service_process(gpointer data)
 
        switch (request_msg->msg_type) {
        case MC_MSG_DB_UPDATE:
-               if (!MC_STRING_VALID(request_msg->msg) || request_msg->msg_size == 0) {
-                       mc_error("Invalid message length [%zu]", request_msg->msg_size);
-                       send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       break;
-               }
                send_msg = mc_db_request(request_msg->uid, request_msg->msg, request_msg->msg_size);
                break;
 
@@ -620,22 +621,12 @@ static gboolean __mc_service_process(gpointer data)
                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;
-               }
                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;
-               }
                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);