Remove unnecessary codes 33/71733/2
authorsooyeon.kim <sooyeon.kim@samsung.com>
Fri, 27 May 2016 01:52:08 +0000 (10:52 +0900)
committersooyeon.kim <sooyeon.kim@samsung.com>
Fri, 27 May 2016 02:02:47 +0000 (11:02 +0900)
Change-Id: I810df16f815356bb5403d3a454d896ee97667d13
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
client/vc.c
client/vc_mgr.c
client/vc_widget.c
server/vcd_client_data.c
server/vcd_server.c

index 611352e..5ad3709 100644 (file)
@@ -154,17 +154,17 @@ static int __vc_check_privilege()
 static const char* __vc_get_error_code(vc_error_e err)
 {
        switch (err) {
-       case VC_ERROR_NONE:                     return "VC_ERROR_NONE";                 break;
-       case VC_ERROR_OUT_OF_MEMORY:            return "VC_ERROR_OUT_OF_MEMORY";        break;
-       case VC_ERROR_IO_ERROR:                 return "VC_ERROR_IO_ERROR";             break;
-       case VC_ERROR_INVALID_PARAMETER:        return "VC_ERROR_INVALID_PARAMETER";    break;
-       case VC_ERROR_TIMED_OUT:                return "VC_ERROR_TIMED_OUT";            break;
-       case VC_ERROR_RECORDER_BUSY:            return "VC_ERROR_RECORDER_BUSY";        break;
-       case VC_ERROR_INVALID_STATE:            return "VC_ERROR_INVALID_STATE";        break;
-       case VC_ERROR_INVALID_LANGUAGE:         return "VC_ERROR_INVALID_LANGUAGE";     break;
-       case VC_ERROR_ENGINE_NOT_FOUND:         return "VC_ERROR_ENGINE_NOT_FOUND";     break;
-       case VC_ERROR_OPERATION_FAILED:         return "VC_ERROR_OPERATION_FAILED";     break;
-       default:                                return "Invalid error code";            break;
+       case VC_ERROR_NONE:                     return "VC_ERROR_NONE";
+       case VC_ERROR_OUT_OF_MEMORY:            return "VC_ERROR_OUT_OF_MEMORY";
+       case VC_ERROR_IO_ERROR:                 return "VC_ERROR_IO_ERROR";
+       case VC_ERROR_INVALID_PARAMETER:        return "VC_ERROR_INVALID_PARAMETER";
+       case VC_ERROR_TIMED_OUT:                return "VC_ERROR_TIMED_OUT";
+       case VC_ERROR_RECORDER_BUSY:            return "VC_ERROR_RECORDER_BUSY";
+       case VC_ERROR_INVALID_STATE:            return "VC_ERROR_INVALID_STATE";
+       case VC_ERROR_INVALID_LANGUAGE:         return "VC_ERROR_INVALID_LANGUAGE";
+       case VC_ERROR_ENGINE_NOT_FOUND:         return "VC_ERROR_ENGINE_NOT_FOUND";
+       case VC_ERROR_OPERATION_FAILED:         return "VC_ERROR_OPERATION_FAILED";
+       default:                                return "Invalid error code";
        }
        return NULL;
 }
@@ -749,7 +749,7 @@ int vc_get_state(vc_state_e* state)
        case VC_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCC, "Current state is 'None'");            break;
        case VC_STATE_INITIALIZED:      SLOG(LOG_DEBUG, TAG_VCC, "Current state is 'Created'");         break;
        case VC_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCC, "Current state is 'Ready'");           break;
-       default:                        SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state");              break;
+       default:                        SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCC, "=====");
@@ -803,7 +803,7 @@ int vc_get_service_state(vc_service_state_e* state)
        case VC_SERVICE_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCC, "Current service state is 'Ready'");           break;
        case VC_SERVICE_STATE_RECORDING:        SLOG(LOG_DEBUG, TAG_VCC, "Current service state is 'Recording'");       break;
        case VC_SERVICE_STATE_PROCESSING:       SLOG(LOG_DEBUG, TAG_VCC, "Current service state is 'Processing'");      break;
-       default:                                SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state");                      break;
+       default:                                SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCC, "=====");
index 06da0dc..ab70bcb 100644 (file)
@@ -51,17 +51,17 @@ static Eina_Bool __vc_mgr_notify_result(void *data);
 static const char* __vc_mgr_get_error_code(vc_error_e err)
 {
        switch (err) {
-       case VC_ERROR_NONE:                     return "VC_ERROR_NONE";                 break;
-       case VC_ERROR_OUT_OF_MEMORY:            return "VC_ERROR_OUT_OF_MEMORY";        break;
-       case VC_ERROR_IO_ERROR:                 return "VC_ERROR_IO_ERROR";             break;
-       case VC_ERROR_INVALID_PARAMETER:        return "VC_ERROR_INVALID_PARAMETER";    break;
-       case VC_ERROR_TIMED_OUT:                return "VC_ERROR_TIMED_OUT";            break;
-       case VC_ERROR_RECORDER_BUSY:            return "VC_ERROR_RECORDER_BUSY";        break;
-       case VC_ERROR_INVALID_STATE:            return "VC_ERROR_INVALID_STATE";        break;
-       case VC_ERROR_INVALID_LANGUAGE:         return "VC_ERROR_INVALID_LANGUAGE";     break;
-       case VC_ERROR_ENGINE_NOT_FOUND:         return "VC_ERROR_ENGINE_NOT_FOUND";     break;
-       case VC_ERROR_OPERATION_FAILED:         return "VC_ERROR_OPERATION_FAILED";     break;
-       default:                                return "Invalid error code";            break;
+       case VC_ERROR_NONE:                     return "VC_ERROR_NONE";
+       case VC_ERROR_OUT_OF_MEMORY:            return "VC_ERROR_OUT_OF_MEMORY";
+       case VC_ERROR_IO_ERROR:                 return "VC_ERROR_IO_ERROR";
+       case VC_ERROR_INVALID_PARAMETER:        return "VC_ERROR_INVALID_PARAMETER";
+       case VC_ERROR_TIMED_OUT:                return "VC_ERROR_TIMED_OUT";
+       case VC_ERROR_RECORDER_BUSY:            return "VC_ERROR_RECORDER_BUSY";
+       case VC_ERROR_INVALID_STATE:            return "VC_ERROR_INVALID_STATE";
+       case VC_ERROR_INVALID_LANGUAGE:         return "VC_ERROR_INVALID_LANGUAGE";
+       case VC_ERROR_ENGINE_NOT_FOUND:         return "VC_ERROR_ENGINE_NOT_FOUND";
+       case VC_ERROR_OPERATION_FAILED:         return "VC_ERROR_OPERATION_FAILED";
+       default:                                return "Invalid error code";
        }
        return NULL;
 }
@@ -496,7 +496,7 @@ int vc_mgr_get_state(vc_state_e* state)
        case VC_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'None'");            break;
        case VC_STATE_INITIALIZED:      SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'Created'");         break;
        case VC_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'Ready'");           break;
-       default:                        SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state");              break;
+       default:                        SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCM, "=====");
@@ -540,7 +540,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state)
        case VC_SERVICE_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCM, "Current service state is 'Ready'");           break;
        case VC_SERVICE_STATE_RECORDING:        SLOG(LOG_DEBUG, TAG_VCM, "Current service state is 'Recording'");       break;
        case VC_SERVICE_STATE_PROCESSING:       SLOG(LOG_DEBUG, TAG_VCM, "Current service state is 'Processing'");      break;
-       default:                                SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state");                      break;
+       default:                                SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCM, "=====");
@@ -665,7 +665,7 @@ int vc_mgr_is_command_format_supported(vc_cmd_format_e format, bool* support)
        case VC_CMD_FORMAT_FIXED:                       *support = true;                break;
        case VC_CMD_FORMAT_FIXED_AND_EXTRA:     *support = non_fixed_support;   break;
        case VC_CMD_FORMAT_EXTRA_AND_FIXED:     *support = non_fixed_support;   break;
-       default:                                        *support = false;               break;
+       default:                                        *support = false;
        }
 
        SLOG(LOG_ERROR, TAG_VCM, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false");
@@ -2401,4 +2401,4 @@ int __vc_mgr_request_auth_cancel(int pid)
        ecore_timer_add(0, __request_auth_cancel, NULL);
 
        return 0;
-}
\ No newline at end of file
+}
index 7002bda..c342d67 100755 (executable)
@@ -46,15 +46,15 @@ const char* vc_tag()
 static const char* __vc_widget_get_error_code(vc_error_e err)
 {
        switch (err) {
-       case VC_ERROR_NONE:             return "VC_ERROR_NONE";                 break;
-       case VC_ERROR_OUT_OF_MEMORY:    return "VC_ERROR_OUT_OF_MEMORY";        break;
-       case VC_ERROR_IO_ERROR:         return "VC_ERROR_IO_ERROR";             break;
-       case VC_ERROR_INVALID_PARAMETER:return "VC_ERROR_INVALID_PARAMETER";    break;
-       case VC_ERROR_TIMED_OUT:        return "VC_ERROR_TIMED_OUT";            break;
-       case VC_ERROR_INVALID_STATE:    return "VC_ERROR_INVALID_STATE";        break;
-       case VC_ERROR_ENGINE_NOT_FOUND: return "VC_ERROR_ENGINE_NOT_FOUND";     break;
-       case VC_ERROR_OPERATION_FAILED: return "VC_ERROR_OPERATION_FAILED";     break;
-       default:                        return "Invalid error code";            break;
+       case VC_ERROR_NONE:             return "VC_ERROR_NONE";
+       case VC_ERROR_OUT_OF_MEMORY:    return "VC_ERROR_OUT_OF_MEMORY";
+       case VC_ERROR_IO_ERROR:         return "VC_ERROR_IO_ERROR";
+       case VC_ERROR_INVALID_PARAMETER:return "VC_ERROR_INVALID_PARAMETER";
+       case VC_ERROR_TIMED_OUT:        return "VC_ERROR_TIMED_OUT";
+       case VC_ERROR_INVALID_STATE:    return "VC_ERROR_INVALID_STATE";
+       case VC_ERROR_ENGINE_NOT_FOUND: return "VC_ERROR_ENGINE_NOT_FOUND";
+       case VC_ERROR_OPERATION_FAILED: return "VC_ERROR_OPERATION_FAILED";
+       default:                        return "Invalid error code";
        }
        return NULL;
 }
@@ -399,7 +399,7 @@ int vc_widget_get_state(vc_state_e* state)
        case VC_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCW, "Current state is 'None'");            break;
        case VC_STATE_INITIALIZED:      SLOG(LOG_DEBUG, TAG_VCW, "Current state is 'Created'");         break;
        case VC_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCW, "Current state is 'Ready'");           break;
-       default:                        SLOG(LOG_ERROR, TAG_VCW, "Invalid state");                      break;
+       default:                        SLOG(LOG_ERROR, TAG_VCW, "Invalid state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCW, "=====");
@@ -446,7 +446,7 @@ int vc_widget_get_service_state(vc_service_state_e* state)
        case VC_SERVICE_STATE_READY:            SLOG(LOG_DEBUG, TAG_VCW, "Current service state is 'Ready'");           break;
        case VC_SERVICE_STATE_RECORDING:        SLOG(LOG_DEBUG, TAG_VCW, "Current service state is 'Recording'");       break;
        case VC_SERVICE_STATE_PROCESSING:       SLOG(LOG_DEBUG, TAG_VCW, "Current service state is 'Processing'");      break;
-       default:                                SLOG(LOG_ERROR, TAG_VCW, "Invalid service state");                      break;
+       default:                                SLOG(LOG_ERROR, TAG_VCW, "Invalid service state");
        }
 
        SLOG(LOG_DEBUG, TAG_VCW, "=====");
index 5d5ff34..c922c4d 100644 (file)
@@ -1364,4 +1364,4 @@ int vcd_client_widget_unset_command(int pid)
        info->widget_cmd = false;
 
        return 0;
-}
\ No newline at end of file
+}
index 2643476..748e548 100644 (file)
@@ -257,13 +257,13 @@ static Eina_Bool __vcd_send_selected_result(void *data)
 static int __convert_type_to_priority(vc_cmd_type_e type)
 {
        switch (type) {
-               case VC_COMMAND_TYPE_NONE:              return 0; break;
-               case VC_COMMAND_TYPE_BACKGROUND:        return 1; break;
-               case VC_COMMAND_TYPE_FOREGROUND:        return 2; break;
-               case VC_COMMAND_TYPE_WIDGET:            return 2; break;
-               case VC_COMMAND_TYPE_SYSTEM:            return 3; break;
-               case VC_COMMAND_TYPE_EXCLUSIVE:         return 3; break;
-               default:                                return 0; break;
+               case VC_COMMAND_TYPE_NONE:              return 0;
+               case VC_COMMAND_TYPE_BACKGROUND:        return 1;
+               case VC_COMMAND_TYPE_FOREGROUND:        return 2;
+               case VC_COMMAND_TYPE_WIDGET:            return 2;
+               case VC_COMMAND_TYPE_SYSTEM:            return 3;
+               case VC_COMMAND_TYPE_EXCLUSIVE:         return 3;
+               default:                                return 0;
        }
 }
 
@@ -272,8 +272,6 @@ static void __vcd_server_pre_result_cb(vcp_pre_result_event_e event, const char*
        if (NULL != pre_result) {
                vcdc_send_pre_result_to_manager(vcd_client_manager_get_pid(), event, pre_result);
        }
-
-       return;
 }
 
 static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int count, const char* all_result,