Clean up code according to coding rule 07/46307/1 accepted/tizen/mobile/20150819.072736 accepted/tizen/tv/20150819.072758 accepted/tizen/wearable/20150819.072810 submit/tizen/20150819.062238
authorLee Dongyeol <dy3.lee@samsung.com>
Wed, 19 Aug 2015 05:31:04 +0000 (14:31 +0900)
committerLee Dongyeol <dy3.lee@samsung.com>
Wed, 19 Aug 2015 05:31:04 +0000 (14:31 +0900)
Change-Id: I954fc1e74ec07098ec2f4351ac914134928e6d7e

51 files changed:
CMakeLists.txt
client/vc.c
client/vc_client.c
client/vc_client.h
client/vc_dbus.c
client/vc_dbus.h
client/vc_mgr.c
client/vc_mgr_client.c
client/vc_mgr_client.h
client/vc_mgr_dbus.c
client/vc_mgr_dbus.h
client/vc_setting.c
client/vc_widget.c
client/vc_widget_client.c
client/vc_widget_client.h
client/vc_widget_dbus.c
client/vc_widget_dbus.h
common/vc_command.c
common/vc_command.h
common/vc_config_mgr.c
common/vc_config_mgr.h
common/vc_config_parser.c
common/vc_config_parser.h
common/vc_defs.h
common/vc_info_parser.c
common/vc_info_parser.h
common/vc_main.h
include/voice_control.h
include/voice_control_authority.h
include/voice_control_command.h
include/voice_control_command_expand.h
include/voice_control_common.h
include/voice_control_key_defines.h
include/voice_control_manager.h
include/voice_control_plugin_engine.h
include/voice_control_setting.h
include/voice_control_widget.h
server/vcd_client_data.c
server/vcd_client_data.h
server/vcd_config.c
server/vcd_dbus.c
server/vcd_dbus.h
server/vcd_dbus_server.c
server/vcd_dbus_server.h
server/vcd_engine_agent.c
server/vcd_engine_agent.h
server/vcd_main.c
server/vcd_main.h
server/vcd_recorder.c
server/vcd_recorder.h
server/vcd_server.c

index 1cbe38c..ccb3a92 100644 (file)
@@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 
 ## Dependent packages ##
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED  
+pkg_check_modules(pkgs REQUIRED
     aul capi-base-common capi-media-audio-io capi-media-sound-manager capi-network-bluetooth
     dbus-1 dlog ecore glib-2.0 libprivilege-control libxml-2.0 vconf
 )
index e517c9e..a5b7ed3 100644 (file)
@@ -43,7 +43,7 @@ Eina_Bool __vc_notify_error(void *data);
 
 static const char* __vc_get_error_code(vc_error_e err)
 {
-       switch(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;
@@ -75,8 +75,8 @@ static int __vc_convert_config_error_code(vc_config_error_e code)
 
 static void __vc_lang_changed_cb(const char* before_lang, const char* current_lang)
 {
-       SECURE_SLOG(LOG_DEBUG, TAG_VCC, "Lang changed : Before lang(%s) Current lang(%s)", 
-               before_lang, current_lang);
+       SLOG(LOG_DEBUG, TAG_VCC, "Lang changed : Before lang(%s) Current lang(%s)",
+                before_lang, current_lang);
 
        vc_current_language_changed_cb callback;
        void* lang_user_data;
@@ -118,7 +118,8 @@ static void __vc_service_state_changed_cb(int before_state, int current_state)
        return;
 }
 
-int vc_initialize()
+
+int vc_initialize(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Initialize");
 
@@ -145,8 +146,8 @@ int vc_initialize()
 
        int ret = vc_config_mgr_initialize(g_vc->handle);
        if (0 != ret) {
-               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to init config manager : %s", 
-                       __vc_get_error_code(__vc_convert_config_error_code(ret)));
+               SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to init config manager : %s",
+                        __vc_get_error_code(__vc_convert_config_error_code(ret)));
                vc_client_destroy(g_vc);
                return __vc_convert_config_error_code(ret);
        }
@@ -186,7 +187,7 @@ int vc_initialize()
        return VC_ERROR_NONE;
 }
 
-static void __vc_internal_unprepare()
+static void __vc_internal_unprepare(void)
 {
        /* return authority */
        vc_auth_state_e state = VC_AUTH_STATE_NONE;
@@ -217,7 +218,7 @@ static void __vc_internal_unprepare()
        return;
 }
 
-int vc_deinitialize()
+int vc_deinitialize(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Deinitialize");
 
@@ -295,8 +296,8 @@ static Eina_Bool __notify_auth_changed_cb(void *data)
 }
 
 #if 0
-static Eina_Bool __vc_x_event_window_focus_in(void *data, int type, void *event) 
-{ 
+static Eina_Bool __vc_x_event_window_focus_in(void *data, int type, void *event)
+{
        Ecore_X_Event_Window_Focus_In *e;
 
        e = event;
@@ -321,17 +322,17 @@ static Eina_Bool __vc_x_event_window_focus_in(void *data, int type, void *event)
                }
                if (VC_AUTH_STATE_INVALID == state) {
                        vc_client_set_auth_state(g_vc, VC_AUTH_STATE_VALID);
-                       
+
                        /* notify auth changed cb */
                        ecore_timer_add(0, __notify_auth_changed_cb, NULL);
                }
        }
 
        return ECORE_CALLBACK_PASS_ON;
-} 
+}
 
-static Eina_Bool __vc_x_event_window_focus_out(void *data, int type, void *event) 
-{ 
+static Eina_Bool __vc_x_event_window_focus_out(void *data, int type, void *event)
+{
        Ecore_X_Event_Window_Focus_In *e;
 
        e = event;
@@ -420,7 +421,7 @@ static Eina_Bool __vc_connect_daemon(void *data)
        return EINA_FALSE;
 }
 
-int vc_prepare()
+int vc_prepare(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Prepare");
 
@@ -440,7 +441,6 @@ int vc_prepare()
                return VC_ERROR_INVALID_STATE;
        }
 
-
        g_connect_timer = ecore_timer_add(0, __vc_connect_daemon, NULL);
 
        SLOG(LOG_DEBUG, TAG_VCC, "=====");
@@ -449,7 +449,7 @@ int vc_prepare()
        return VC_ERROR_NONE;
 }
 
-int vc_unprepare()
+int vc_unprepare(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Unprepare");
 
@@ -564,7 +564,7 @@ int vc_get_state(vc_state_e* state)
 
        *state = temp;
 
-       switch(*state) {
+       switch (*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;
@@ -603,12 +603,12 @@ int vc_get_service_state(vc_service_state_e* state)
 
        *state = service_state;
 
-       switch(*state) {
-       case VC_SERVICE_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCC, "Current service state is 'None'");            break;
-       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;
+       switch (*state) {
+               case VC_SERVICE_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCC, "Current service state is 'None'");            break;
+               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;
        }
 
        SLOG(LOG_DEBUG, TAG_VCC, "=====");
@@ -617,7 +617,7 @@ int vc_get_service_state(vc_service_state_e* state)
        return VC_ERROR_NONE;
 }
 
-#if 0 
+#if 0
 int vc_set_window_id(int wid)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Set Window id");
@@ -725,7 +725,7 @@ int vc_get_window_id(int* wid)
 *
 * @pre The state should be #VC_STATE_READY.
 */
-#if 0 
+#if 0
 int vc_is_command_format_supported(vc_cmd_format_e format, bool* support)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Is command format supported");
@@ -761,7 +761,7 @@ int vc_is_command_format_supported(vc_cmd_format_e format, bool* support)
 #endif
 
 int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type)
-{ 
+{
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Set Command list");
 
        if (NULL == vc_cmd_list) {
@@ -818,7 +818,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type)
                                        }
                                }
                        }
-               } while(0 != ret);
+               } while (0 != ret);
        }
 
        SLOG(LOG_DEBUG, TAG_VCC, "=====");
@@ -1032,7 +1032,7 @@ int vc_request_start(bool stop_by_silence)
        return ret;
 }
 
-int vc_request_stop()
+int vc_request_stop(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request stop");
 
@@ -1091,7 +1091,7 @@ int vc_request_stop()
        return ret;
 }
 
-int vc_request_cancel()
+int vc_request_cancel(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request cancel Interrupt");
 
@@ -1168,7 +1168,7 @@ Eina_Bool __vc_notify_error(void *data)
                SLOG(LOG_DEBUG, TAG_VCC, "Error callback is called");
        } else {
                SLOG(LOG_WARN, TAG_VCC, "[WARNING] Error callback is null");
-       }  
+       }
 
        return EINA_FALSE;
 }
@@ -1243,7 +1243,7 @@ static Eina_Bool __vc_notify_result(void *data)
        callback(event, vc_cmd_list, temp_text, user_data);
        vc_client_not_use_callback(g_vc);
 
-       SLOG(LOG_DEBUG, TAG_VCC, "Client result callback called");      
+       SLOG(LOG_DEBUG, TAG_VCC, "Client result callback called");
 
        vc_cmd_list_destroy(vc_cmd_list, true);
 
@@ -1253,7 +1253,7 @@ static Eina_Bool __vc_notify_result(void *data)
        return EINA_FALSE;
 }
 
-void __vc_cb_result()
+void __vc_cb_result(void)
 {
        ecore_timer_add(0, __vc_notify_result, NULL);
 
@@ -1278,11 +1278,11 @@ int vc_set_result_cb(vc_result_cb callback, void* user_data)
        }
 
        vc_client_set_result_cb(g_vc, callback, user_data);
-       
+
        return 0;
 }
 
-int vc_unset_result_cb()
+int vc_unset_result_cb(void)
 {
        vc_state_e state;
        if (0 != vc_client_get_client_state(g_vc, &state)) {
@@ -1319,11 +1319,11 @@ int vc_set_service_state_changed_cb(vc_service_state_changed_cb callback, void*
        }
 
        vc_client_set_service_state_changed_cb(g_vc, callback, user_data);
-       
+
        return 0;
 }
 
-int vc_unset_service_state_changed_cb()
+int vc_unset_service_state_changed_cb(void)
 {
        vc_state_e state;
        if (0 != vc_client_get_client_state(g_vc, &state)) {
@@ -1364,7 +1364,7 @@ int vc_set_state_changed_cb(vc_state_changed_cb callback, void* user_data)
        return 0;
 }
 
-int vc_unset_state_changed_cb()
+int vc_unset_state_changed_cb(void)
 {
        vc_state_e state;
        if (0 != vc_client_get_client_state(g_vc, &state)) {
@@ -1405,7 +1405,7 @@ int vc_set_current_language_changed_cb(vc_current_language_changed_cb callback,
        return 0;
 }
 
-int vc_unset_current_language_changed_cb()
+int vc_unset_current_language_changed_cb(void)
 {
        vc_state_e state;
        if (0 != vc_client_get_client_state(g_vc, &state)) {
@@ -1446,7 +1446,7 @@ int vc_set_error_cb(vc_error_cb callback, void* user_data)
        return 0;
 }
 
-int vc_unset_error_cb()
+int vc_unset_error_cb(void)
 {
        vc_state_e state;
        if (0 != vc_client_get_client_state(g_vc, &state)) {
@@ -1466,7 +1466,7 @@ int vc_unset_error_cb()
 }
 
 /* Authority */
-int vc_auth_enable()
+int vc_auth_enable(void)
 {
        /* check state */
        vc_state_e state;
@@ -1525,11 +1525,11 @@ int vc_auth_enable()
        ecore_timer_add(0, __notify_auth_changed_cb, NULL);
 
        SLOG(LOG_DEBUG, TAG_VCC, "[SUCCESS] Auth enable");
-       
+
        return VC_ERROR_NONE;
 }
 
-int vc_auth_disable()
+int vc_auth_disable(void)
 {
        /* check state */
        vc_state_e state;
@@ -1608,7 +1608,7 @@ int vc_auth_get_state(vc_auth_state_e* state)
        *state = temp;
 
        SLOG(LOG_DEBUG, TAG_VCC, "[SUCCESS] Current auth state is %d", *state);
-       
+
        return VC_ERROR_NONE;
 }
 
@@ -1643,7 +1643,7 @@ int vc_auth_set_state_changed_cb(vc_auth_state_changed_cb callback, void* user_d
        return VC_ERROR_NONE;
 }
 
-int vc_auth_unset_state_changed_cb()
+int vc_auth_unset_state_changed_cb(void)
 {
        /* check auth */
        vc_auth_state_e auth_state;
@@ -1668,7 +1668,7 @@ int vc_auth_unset_state_changed_cb()
        return VC_ERROR_NONE;
 }
 
-int vc_auth_start()
+int vc_auth_start(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request start");
 
@@ -1748,7 +1748,7 @@ int vc_auth_start()
        return ret;
 }
 
-int vc_auth_stop()
+int vc_auth_stop(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request stop");
 
@@ -1826,7 +1826,7 @@ int vc_auth_stop()
        return ret;
 }
 
-int vc_auth_cancel()
+int vc_auth_cancel(void)
 {
        SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request cancel");
 
index 430e89b..6e96189 100644 (file)
@@ -34,7 +34,7 @@ typedef struct {
        void*                           state_changed_user_data;
        vc_current_language_changed_cb  current_lang_changed_cb;
        void*                           current_lang_changed_user_data;
-       
+
 #if 0
        /* exclusive option */
        bool                    exclusive_cmd;
@@ -60,7 +60,7 @@ typedef struct {
        void*                           auth_state_changed_user_data;
 
        int     mgr_pid;
-}vc_client_s;
+} vc_client_s;
 
 /* client list */
 static GSList *g_client_list = NULL;
@@ -75,9 +75,9 @@ static vc_client_s* __client_get(vc_h vc)
        vc_client_s *data = NULL;
 
        int count = g_slist_length(g_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_client_list, i);
 
                if (NULL != data) {
@@ -109,11 +109,11 @@ int vc_client_create(vc_h* vc)
                return VC_ERROR_OUT_OF_MEMORY;
        }
 
-       temp->handle = getpid(); 
+       temp->handle = getpid();
 
        /* initialize client data */
        client->vc = temp;
-       client->pid = getpid(); 
+       client->pid = getpid();
        client->uid = temp->handle;
        client->xid = -1;
 
@@ -134,8 +134,8 @@ int vc_client_create(vc_h* vc)
 
        client->service_state = -1;
 
-       client->before_state = VC_STATE_INITIALIZED; 
-       client->current_state = VC_STATE_INITIALIZED; 
+       client->before_state = VC_STATE_INITIALIZED;
+       client->current_state = VC_STATE_INITIALIZED;
 
        client->cb_ref_count = 0;
 
@@ -157,22 +157,21 @@ int vc_client_destroy(vc_h vc)
        if (vc == NULL) {
                SLOG(LOG_ERROR, TAG_VCC, "Input parameter is NULL");
                return 0;
-       }       
+       }
 
        vc_client_s *data = NULL;
 
        int count = g_slist_length(g_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_client_list, i);
 
                if (NULL != data) {
                        if (vc->handle == data->vc->handle) {
                                g_client_list =  g_slist_remove(g_client_list, data);
 
-                               while (0 != data->cb_ref_count)
-                               {
+                               while (0 != data->cb_ref_count) {
                                        /* wait for release callback function */
                                }
                                free(data);
@@ -206,13 +205,13 @@ bool vc_client_is_valid_by_uid(int uid)
        vc_client_s *data = NULL;
 
        int count = g_slist_length(g_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_client_list, i);
 
                if (NULL != data) {
-                       if (uid == data->vc->handle) 
+                       if (uid == data->vc->handle)
                                return true;
                }
        }
@@ -225,11 +224,11 @@ bool vc_client_is_valid_by_uid(int uid)
 int vc_client_get_handle(int uid, vc_h* vc)
 {
        vc_client_s *data = NULL;
-       
+
        int count = g_slist_length(g_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_client_list, i);
 
                if (NULL != data) {
@@ -239,7 +238,7 @@ int vc_client_get_handle(int uid, vc_h* vc)
                        }
                }
        }
-       
+
        return -1;
 }
 
@@ -249,7 +248,7 @@ int vc_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_data)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->result_cb = callback;
@@ -263,13 +262,13 @@ int vc_client_get_result_cb(vc_h vc, vc_result_cb* callback, void** user_data)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->result_cb;
        *user_data = client->result_user_data;
 
-       return 0;       
+       return 0;
 }
 
 int vc_client_set_service_state_changed_cb(vc_h vc, vc_service_state_changed_cb callback, void* user_data)
@@ -277,7 +276,7 @@ int vc_client_set_service_state_changed_cb(vc_h vc, vc_service_state_changed_cb
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->service_state_changed_cb = callback;
@@ -291,7 +290,7 @@ int vc_client_get_service_state_changed_cb(vc_h vc, vc_service_state_changed_cb*
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->service_state_changed_cb;
@@ -305,7 +304,7 @@ int vc_client_set_state_changed_cb(vc_h vc, vc_state_changed_cb callback, void*
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->state_changed_cb = callback;
@@ -319,7 +318,7 @@ int vc_client_get_state_changed_cb(vc_h vc, vc_state_changed_cb* callback, void*
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->state_changed_cb;
@@ -333,7 +332,7 @@ int vc_client_set_current_lang_changed_cb(vc_h vc, vc_current_language_changed_c
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->current_lang_changed_cb = callback;
@@ -347,7 +346,7 @@ int vc_client_get_current_lang_changed_cb(vc_h vc, vc_current_language_changed_c
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->current_lang_changed_cb;
@@ -361,7 +360,7 @@ int vc_client_set_error_cb(vc_h vc, vc_error_cb callback, void* user_data)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->error_cb = callback;
@@ -375,7 +374,7 @@ int vc_client_get_error_cb(vc_h vc, vc_error_cb* callback, void** user_data)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->error_cb;
@@ -390,7 +389,7 @@ int vc_client_set_service_state(vc_h vc, vc_service_state_e state)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->service_state = state;
@@ -403,7 +402,7 @@ int vc_client_get_service_state(vc_h vc, vc_service_state_e* state)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = client->service_state;
@@ -416,7 +415,7 @@ int vc_client_set_client_state(vc_h vc, vc_state_e state)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->before_state = client->current_state;
@@ -430,7 +429,7 @@ int vc_client_get_client_state(vc_h vc, vc_state_e* state)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = client->current_state;
@@ -443,9 +442,9 @@ int vc_client_get_client_state_by_uid(int uid, vc_state_e* state)
        vc_client_s *data = NULL;
 
        int count = g_slist_length(g_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_client_list, i);
 
                if (NULL != data) {
@@ -464,7 +463,7 @@ int vc_client_get_before_state(vc_h vc, vc_state_e* state, vc_state_e* before_st
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *before_state = client->before_state;
@@ -478,7 +477,7 @@ int vc_client_set_xid(vc_h vc, int xid)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->xid = xid;
@@ -491,7 +490,7 @@ int vc_client_get_xid(vc_h vc, int* xid)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *xid = client->xid;
@@ -505,7 +504,7 @@ int vc_client_set_exclusive_cmd(vc_h vc, bool value)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->exclusive_cmd = value;
@@ -518,7 +517,7 @@ int vc_client_get_exclusive_cmd(vc_h vc, bool* value)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *value = client->exclusive_cmd;
@@ -532,7 +531,7 @@ int vc_client_set_error(vc_h vc, int reason)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->reason = reason;
@@ -545,7 +544,7 @@ int vc_client_get_error(vc_h vc, int* reason)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *reason = client->reason;
@@ -565,7 +564,7 @@ int vc_client_use_callback(vc_h vc)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->cb_ref_count++;
@@ -577,7 +576,7 @@ int vc_client_not_use_callback(vc_h vc)
        vc_client_s* client = __client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->cb_ref_count--;
index 6ae3c81..948228f 100644 (file)
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-/* 
-* Common function 
+/*
+* Common function
 */
 int vc_client_create(vc_h* vc);
 
@@ -41,8 +41,8 @@ bool vc_client_is_valid_by_uid(int uid);
 
 int vc_client_get_handle(int uid, vc_h* vc);
 
-/* 
-* set/get callback function 
+/*
+* set/get callback function
 */
 int vc_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_data);
 
@@ -65,8 +65,8 @@ int vc_client_set_error_cb(vc_h vc, vc_error_cb callback, void* user_data);
 int vc_client_get_error_cb(vc_h vc, vc_error_cb* callback, void** user_data);
 
 
-/* 
-* set/get option 
+/*
+* set/get option
 */
 int vc_client_set_service_state(vc_h vc, vc_service_state_e state);
 
index 8441f66..e51f4b8 100644 (file)
@@ -181,9 +181,9 @@ int vc_dbus_open_connection()
        /* connect to the DBUS system bus, and check for errors */
        g_conn_sender = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
 
-       if (dbus_error_is_set(&err)) { 
-               SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message); 
-               dbus_error_free(&err); 
+       if (dbus_error_is_set(&err)) {
+               SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message);
+               dbus_error_free(&err);
        }
 
        if (NULL == g_conn_sender) {
@@ -215,8 +215,8 @@ int vc_dbus_open_connection()
        ret = dbus_bus_request_name(g_conn_listener, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
 
        if (dbus_error_is_set(&err)) {
-               SLOG(LOG_ERROR, TAG_VCC, "Name Error (%s)", err.message); 
-               dbus_error_free(&err); 
+               SLOG(LOG_ERROR, TAG_VCC, "Name Error (%s)", err.message);
+               dbus_error_free(&err);
        }
 
        if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
@@ -224,23 +224,22 @@ int vc_dbus_open_connection()
                return -2;
        }
 
-       if( NULL != g_fd_handler ) {
+       if (NULL != g_fd_handler) {
                SLOG(LOG_WARN, TAG_VCC, "The handler already exists.");
                return 0;
        }
 
-       char rule[128];
+       char rule[128] = {0, };
        snprintf(rule, 128, "type='signal',interface='%s'", VC_CLIENT_SERVICE_INTERFACE);
 
        /* add a rule for which messages we want to see */
        dbus_bus_add_match(g_conn_listener, rule, &err);
        dbus_connection_flush(g_conn_listener);
 
-       if (dbus_error_is_set(&err)) 
-       { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message);
                dbus_error_free(&err);
-               return VC_ERROR_OPERATION_FAILED; 
+               return VC_ERROR_OPERATION_FAILED;
        }
 
        int fd = 0;
@@ -306,6 +305,7 @@ int vc_dbus_reconnect()
 
                SLOG(LOG_DEBUG, TAG_VCC, "[DBUS] Reconnect");
        }
+
        return 0;
 }
 
@@ -314,15 +314,15 @@ int vc_dbus_request_hello()
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_HELLO);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_HELLO);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> Request vc hello : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> Request vc hello : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
-       } 
+       }
 
        DBusError err;
        dbus_error_init(&err);
@@ -354,21 +354,21 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_INITIALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_INITIALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc initialize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc initialize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc initialize : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                       DBUS_TYPE_INT32, &pid,
+                       DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -391,9 +391,9 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid)
                        DBUS_TYPE_INT32, &tmp,
                        DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -419,13 +419,13 @@ int vc_dbus_request_finalize(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_FINALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_FINALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc finalize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc finalize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc finalize : pid(%d)", pid);
@@ -448,13 +448,13 @@ int vc_dbus_request_finalize(int pid)
        }
 
        if (NULL != result_msg) {
-               dbus_message_get_args(result_msg, &err, 
-                               DBUS_TYPE_INT32, &result,
-                               DBUS_TYPE_INVALID);
+               dbus_message_get_args(result_msg, &err,
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -479,13 +479,13 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_SET_EXCLUSIVE_CMD);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_SET_EXCLUSIVE_CMD);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set exclusive command : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set exclusive command : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set exclusive command : pid(%d)", pid);
@@ -493,10 +493,10 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value)
 
        int temp = value;
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INT32, &temp,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INT32, &temp,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -514,12 +514,12 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -543,22 +543,22 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_SET_COMMAND);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_SET_COMMAND);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set command : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set command : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set command : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INT32, &cmd_type,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INT32, &cmd_type,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -576,12 +576,12 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -597,7 +597,7 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type)
                result = VC_ERROR_TIMED_OUT;
        }
 
-       return result;  
+       return result;
 }
 
 int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type)
@@ -605,22 +605,22 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_UNSET_COMMAND);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_UNSET_COMMAND);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc unset command : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc unset command : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc unset command : pid(%d), type(%d)", pid, cmd_type);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INT32, &cmd_type,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INT32, &cmd_type,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -638,12 +638,12 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -669,13 +669,13 @@ int vc_dbus_request_start(int pid, int silence)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_METHOD_REQUEST_START);               
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_REQUEST_START);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc start : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc start : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc start : pid(%d), silence(%d)", pid, silence);
@@ -704,12 +704,12 @@ int vc_dbus_request_start(int pid, int silence)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -734,21 +734,21 @@ int vc_dbus_request_stop(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_METHOD_REQUEST_STOP);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_REQUEST_STOP);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc stop : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc stop : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc stop : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -766,12 +766,12 @@ int vc_dbus_request_stop(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -796,21 +796,21 @@ int vc_dbus_request_cancel(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  /* object name of the signal */
-               VC_SERVER_SERVICE_INTERFACE,    /* interface name of the signal */
-               VC_METHOD_REQUEST_CANCEL);      /* name of the signal */
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,        /* object name of the signal */
+                         VC_SERVER_SERVICE_INTERFACE,  /* interface name of the signal */
+                         VC_METHOD_REQUEST_CANCEL);    /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc cancel : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc cancel : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc cancel : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -828,12 +828,12 @@ int vc_dbus_request_cancel(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -868,21 +868,21 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               service_name,
-               object_path,    /* object name of the signal */
-               target_if_name, /* interface name of the signal */
-               VC_METHOD_AUTH_ENABLE); /* name of the signal */
+                         service_name,
+                         object_path,  /* object name of the signal */
+                         target_if_name,       /* interface name of the signal */
+                         VC_METHOD_AUTH_ENABLE);       /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth enable : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth enable : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth enable : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -900,12 +900,12 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -938,21 +938,21 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               service_name,
-               object_path,    /* object name of the signal */
-               target_if_name, /* interface name of the signal */
-               VC_METHOD_AUTH_DISABLE);        /* name of the signal */
+                         service_name,
+                         object_path,  /* object name of the signal */
+                         target_if_name,       /* interface name of the signal */
+                         VC_METHOD_AUTH_DISABLE);      /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth disable : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth disable : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth disable : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -970,12 +970,12 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1008,13 +1008,13 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               service_name,
-               object_path,    
-               target_if_name, 
-               VC_METHOD_AUTH_START);          
+                         service_name,
+                         object_path,
+                         target_if_name,
+                         VC_METHOD_AUTH_START);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth start : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth start : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth start : pid(%d)", pid);
@@ -1025,7 +1025,7 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid)
 
        /* Append result*/
        dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &(pid));
-       
+
        DBusError err;
        dbus_error_init(&err);
 
@@ -1042,12 +1042,12 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1080,21 +1080,21 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               service_name,
-               object_path,    
-               target_if_name, 
-               VC_METHOD_AUTH_STOP);
+                         service_name,
+                         object_path,
+                         target_if_name,
+                         VC_METHOD_AUTH_STOP);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth stop : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth stop : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth stop : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -1112,12 +1112,12 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1150,21 +1150,21 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               service_name,
-               object_path,    /* object name of the signal */
-               target_if_name, /* interface name of the signal */
-               VC_METHOD_AUTH_CANCEL); /* name of the signal */
+                         service_name,
+                         object_path,  /* object name of the signal */
+                         target_if_name,       /* interface name of the signal */
+                         VC_METHOD_AUTH_CANCEL);       /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth cancel : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth cancel : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth cancel : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -1182,12 +1182,12 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
index f8780a1..907afab 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_DBUS_H_
 #define __VC_DBUS_H_
 
index 40c74ca..f09bc5f 100644 (file)
@@ -43,7 +43,7 @@ static Eina_Bool __vc_mgr_notify_result(void *data);
 
 static const char* __vc_mgr_get_error_code(vc_error_e err)
 {
-       switch(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;
@@ -61,8 +61,8 @@ static const char* __vc_mgr_get_error_code(vc_error_e err)
 
 static void __vc_mgr_lang_changed_cb(const char* before_lang, const char* current_lang)
 {
-       SECURE_SLOG(LOG_DEBUG, TAG_VCM, "Lang changed : Before lang(%s) Current lang(%s)", 
-               before_lang, current_lang);
+       SLOG(LOG_DEBUG, TAG_VCM, "Lang changed : Before lang(%s) Current lang(%s)",
+                               before_lang, current_lang);
 
        vc_current_language_changed_cb callback = NULL;
        void* lang_user_data;
@@ -201,7 +201,6 @@ static void __vc_mgr_internal_unprepare()
                SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request finalize : %s", __vc_mgr_get_error_code(ret));
        }
 
-
        vc_cmd_parser_delete_file(getpid(), VC_COMMAND_TYPE_SYSTEM);
        vc_cmd_parser_delete_file(getpid(), VC_COMMAND_TYPE_EXCLUSIVE);
 
@@ -339,7 +338,6 @@ int vc_mgr_prepare()
                return VC_ERROR_INVALID_STATE;
        }
 
-
        g_m_connect_timer = ecore_timer_add(0, __vc_mgr_connect_daemon, NULL);
 
        SLOG(LOG_DEBUG, TAG_VCM, "=====");
@@ -455,7 +453,7 @@ int vc_mgr_get_state(vc_state_e* state)
 
        *state = temp;
 
-       switch(*state) {
+       switch (*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;
@@ -498,7 +496,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state)
 
        *state = service_state;
 
-       switch(*state) {
+       switch (*state) {
                case VC_SERVICE_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCM, "Current service state is 'None'");            break;
                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;
@@ -548,7 +546,7 @@ int vc_mgr_set_demandable_client_rule(const char* rule)
 
        SLOG(LOG_DEBUG, TAG_VCM, "=====");
        SLOG(LOG_DEBUG, TAG_VCM, " ");
-       
+
        return 0;
 
        /*
@@ -640,7 +638,7 @@ int vc_mgr_is_command_format_supported(vc_cmd_format_e format, bool* support)
 }
 
 int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list)
-{ 
+{
        SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Set Command list");
 
        vc_state_e state;
@@ -697,7 +695,7 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list)
                                        }
                                }
                        }
-               } while(0 != ret);
+               } while (0 != ret);
        }
 
        SLOG(LOG_DEBUG, TAG_VCM, "=====");
@@ -998,7 +996,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list)
                SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] No client");
                return 0;
        }
-       
+
        if (VC_NO_FOREGROUND_PID != fg_pid) {
                iter = g_slist_nth(client_info_list, 0);
                while (NULL != iter) {
@@ -1075,7 +1073,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list)
                                        ret = vc_cmd_parser_append_commands(client_info->pid, VC_COMMAND_TYPE_BACKGROUND, temp_list);
                                        if (0 != ret) {
                                                SLOG(LOG_ERROR, TAG_VCM, "[Client Data ERROR] Fail to get the bg command list : pid(%d)", client_info->pid);
-                                       } 
+                                       }
                                }
                                free(client_info);
                        }
@@ -1338,7 +1336,7 @@ int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list)
                char* result_text = NULL;
 
                vc_mgr_client_get_all_result(g_vc_m, &event, &result_text);
-               
+
                vc_info_parser_set_result(result_text, event, NULL, vc_cmd_list, false);
 
                if (NULL != result_text) {
@@ -1346,7 +1344,7 @@ int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list)
                        result_text = NULL;
                }
        }
-       
+
        int ret;
        int count = 0;
 
@@ -1576,7 +1574,7 @@ int vc_mgr_set_all_result_cb(vc_mgr_all_result_cb callback, void* user_data)
        vc_mgr_client_set_all_result_cb(g_vc_m, callback, user_data);
 
        SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set all result callback");
-       
+
        return 0;
 }
 
@@ -1617,7 +1615,7 @@ int vc_mgr_set_result_cb(vc_result_cb callback, void* user_data)
        }
 
        vc_mgr_client_set_result_cb(g_vc_m, callback, user_data);
-       
+
        return 0;
 }
 
@@ -1658,7 +1656,7 @@ static Eina_Bool __vc_mgr_notify_error(void *data)
                SLOG(LOG_DEBUG, TAG_VCM, "Error callback is called");
        } else {
                SLOG(LOG_WARN, TAG_VCM, "[WARNING] Error callback is null");
-       }  
+       }
 
        return EINA_FALSE;
 }
@@ -1971,7 +1969,7 @@ int __vc_mgr_request_auth_enable(int pid)
        if (pid == fore_pid) {
                vc_mgr_client_set_valid_authorized_client(g_vc_m, pid);
        }
-       
+
        return 0;
 }
 
@@ -2032,7 +2030,7 @@ int __vc_mgr_request_auth_start(int pid)
 
        /* add timer for start recording */
        ecore_timer_add(0, __request_auth_start, NULL);
-       
+
        return 0;
 }
 
index 234c81e..7f06778 100644 (file)
@@ -39,7 +39,7 @@ typedef struct {
        void*                           speech_detected_user_data;
        vc_current_language_changed_cb  current_lang_changed_cb;
        void*                           current_lang_changed_user_data;
-       
+
        /* All result */
        vc_result_event_e       all_result_event;
        char*                   all_result_text;
@@ -75,11 +75,11 @@ typedef struct {
        GSList*                 authorized_client_list;
        int                     valid_authorized_pid;
        bool                    start_by_client;
-}vc_mgr_client_s;
+} vc_mgr_client_s;
 
 typedef struct {
        int pid;
-}vc_authorized_client_s;
+} vc_authorized_client_s;
 
 static GSList *g_mgr_client_list = NULL;
 
@@ -93,9 +93,9 @@ static vc_mgr_client_s* __mgr_client_get(vc_h vc)
        vc_mgr_client_s *data = NULL;
 
        int count = g_slist_length(g_mgr_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_mgr_client_list, i);
 
                if (NULL != data) {
@@ -127,11 +127,11 @@ int vc_mgr_client_create(vc_h* vc)
                return VC_ERROR_OUT_OF_MEMORY;
        }
 
-       temp->handle = getpid(); 
+       temp->handle = getpid();
 
        /* initialize client data */
        client->vc = temp;
-       client->pid = getpid(); 
+       client->pid = getpid();
        client->uid = temp->handle;
 
        client->all_result_cb = NULL;
@@ -161,7 +161,7 @@ int vc_mgr_client_create(vc_h* vc)
        client->service_state = -1;
 
        client->before_state = VC_STATE_INITIALIZED;
-       client->current_state = VC_STATE_INITIALIZED; 
+       client->current_state = VC_STATE_INITIALIZED;
 
        client->before_language = NULL;
        client->current_language = NULL;
@@ -187,22 +187,21 @@ int vc_mgr_client_destroy(vc_h vc)
        if (vc == NULL) {
                SLOG(LOG_ERROR, TAG_VCM, "Input parameter is NULL");
                return 0;
-       }       
+       }
 
        vc_mgr_client_s *data = NULL;
 
        int count = g_slist_length(g_mgr_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_mgr_client_list, i);
 
                if (NULL != data) {
                        if (vc->handle == data->vc->handle) {
                                g_mgr_client_list =  g_slist_remove(g_mgr_client_list, data);
 
-                               while (0 != data->cb_ref_count)
-                               {
+                               while (0 != data->cb_ref_count) {
                                        /* wait for release callback function */
                                }
 
@@ -214,8 +213,11 @@ int vc_mgr_client_destroy(vc_h vc)
                                        free(data->all_result_text);
                                }
 
-                               free(data);     data = NULL;
-                               free(vc);       vc = NULL;
+                               free(data);     
+                               free(vc);       
+
+                               data = NULL;
+                               vc = NULL;
 
                                return 0;
                        }
@@ -245,13 +247,13 @@ bool vc_mgr_client_is_valid_by_uid(int uid)
        vc_mgr_client_s *data = NULL;
 
        int count = g_slist_length(g_mgr_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_mgr_client_list, i);
 
                if (NULL != data) {
-                       if (uid == data->vc->handle) 
+                       if (uid == data->vc->handle)
                                return true;
                }
        }
@@ -264,11 +266,11 @@ bool vc_mgr_client_is_valid_by_uid(int uid)
 int vc_mgr_client_get_handle(int uid, vc_h* vc)
 {
        vc_mgr_client_s *data = NULL;
-       
+
        int count = g_slist_length(g_mgr_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_mgr_client_list, i);
 
                if (NULL != data) {
@@ -278,7 +280,7 @@ int vc_mgr_client_get_handle(int uid, vc_h* vc)
                        }
                }
        }
-       
+
        return -1;
 }
 
@@ -302,7 +304,7 @@ int vc_mgr_client_set_all_result_cb(vc_h vc, vc_mgr_all_result_cb callback, void
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->all_result_cb = callback;
@@ -316,13 +318,13 @@ int vc_mgr_client_get_all_result_cb(vc_h vc, vc_mgr_all_result_cb* callback, voi
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->all_result_cb;
        *user_data = client->all_result_user_data;
 
-       return 0;       
+       return 0;
 }
 
 int vc_mgr_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_data)
@@ -330,7 +332,7 @@ int vc_mgr_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_data)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->result_cb = callback;
@@ -344,13 +346,13 @@ int vc_mgr_client_get_result_cb(vc_h vc, vc_result_cb* callback, void** user_dat
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->result_cb;
        *user_data = client->result_user_data;
 
-       return 0;       
+       return 0;
 }
 
 int vc_mgr_client_set_service_state_changed_cb(vc_h vc, vc_service_state_changed_cb callback, void* user_data)
@@ -358,7 +360,7 @@ int vc_mgr_client_set_service_state_changed_cb(vc_h vc, vc_service_state_changed
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->service_state_changed_cb = callback;
@@ -372,7 +374,7 @@ int vc_mgr_client_get_service_state_changed_cb(vc_h vc, vc_service_state_changed
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->service_state_changed_cb;
@@ -386,7 +388,7 @@ int vc_mgr_client_set_state_changed_cb(vc_h vc, vc_state_changed_cb callback, vo
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->state_changed_cb = callback;
@@ -400,7 +402,7 @@ int vc_mgr_client_get_state_changed_cb(vc_h vc, vc_state_changed_cb* callback, v
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->state_changed_cb;
@@ -442,7 +444,7 @@ int vc_mgr_client_set_current_lang_changed_cb(vc_h vc, vc_current_language_chang
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->current_lang_changed_cb = callback;
@@ -456,7 +458,7 @@ int vc_mgr_client_get_current_lang_changed_cb(vc_h vc, vc_current_language_chang
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->current_lang_changed_cb;
@@ -470,7 +472,7 @@ int vc_mgr_client_set_error_cb(vc_h vc, vc_error_cb callback, void* user_data)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->error_cb = callback;
@@ -484,7 +486,7 @@ int vc_mgr_client_get_error_cb(vc_h vc, vc_error_cb* callback, void** user_data)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = client->error_cb;
@@ -500,7 +502,7 @@ int vc_mgr_client_set_service_state(vc_h vc, vc_service_state_e state)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->service_state = state;
@@ -513,7 +515,7 @@ int vc_mgr_client_get_service_state(vc_h vc, vc_service_state_e* state)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = client->service_state;
@@ -526,7 +528,7 @@ int vc_mgr_client_set_client_state(vc_h vc, vc_state_e state)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->before_state = client->current_state;
@@ -540,7 +542,7 @@ int vc_mgr_client_get_client_state(vc_h vc, vc_state_e* state)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = client->current_state;
@@ -553,9 +555,9 @@ int vc_mgr_client_get_client_state_by_uid(int uid, vc_state_e* state)
        vc_mgr_client_s *data = NULL;
 
        int count = g_slist_length(g_mgr_client_list);
-       int i; 
+       int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_mgr_client_list, i);
 
                if (NULL != data) {
@@ -574,7 +576,7 @@ int vc_mgr_client_get_before_state(vc_h vc, vc_state_e* state, vc_state_e* befor
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *before_state = client->before_state;
@@ -588,7 +590,7 @@ int vc_mgr_client_set_error(vc_h vc, int reason)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->reason = reason;
@@ -601,7 +603,7 @@ int vc_mgr_client_get_error(vc_h vc, int* reason)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *reason = client->reason;
@@ -614,7 +616,7 @@ int vc_mgr_client_set_exclusive_command(vc_h vc, bool value)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->exclusive_cmd_option = value;
@@ -627,7 +629,7 @@ bool vc_mgr_client_get_exclusive_command(vc_h vc)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        return client->exclusive_cmd_option;
@@ -638,7 +640,7 @@ int vc_mgr_client_set_all_result(vc_h vc, int event, const char* result_text)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->all_result_event = event;
@@ -656,7 +658,7 @@ int vc_mgr_client_get_all_result(vc_h vc, int* event, char** result_text)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        *event = client->all_result_event;
@@ -674,7 +676,7 @@ int vc_mgr_client_unset_all_result(vc_h vc)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->all_result_event = -1;
@@ -683,7 +685,7 @@ int vc_mgr_client_unset_all_result(vc_h vc)
                free(client->all_result_text);
                client->all_result_text = NULL;
        }
-       
+
        return 0;
 }
 
@@ -692,7 +694,7 @@ int vc_mgr_client_set_audio_type(vc_h vc, const char* audio_id)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        if (NULL != audio_id) {
@@ -715,7 +717,7 @@ int vc_mgr_client_get_audio_type(vc_h vc, char** audio_id)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        if (NULL != client->audio_id)
@@ -737,7 +739,7 @@ int vc_mgr_client_use_callback(vc_h vc)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->cb_ref_count++;
@@ -749,7 +751,7 @@ int vc_mgr_client_not_use_callback(vc_h vc)
        vc_mgr_client_s* client = __mgr_client_get(vc);
 
        /* check handle */
-       if (NULL == client) 
+       if (NULL == client)
                return VC_ERROR_INVALID_PARAMETER;
 
        client->cb_ref_count--;
index d30ab97..b19d31b 100644 (file)
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-/* 
-* Common function 
+/*
+* Common function
 */
 int vc_mgr_client_create(vc_h* vc);
 
@@ -41,8 +41,8 @@ int vc_mgr_client_get_handle(int uid, vc_h* vc);
 
 int vc_mgr_client_get_pid(vc_h vc, int* pid);
 
-/* 
-* set/get callback function 
+/*
+* set/get callback function
 */
 int vc_mgr_client_set_all_result_cb(vc_h vc, vc_mgr_all_result_cb callback, void* user_data);
 
@@ -73,8 +73,8 @@ int vc_mgr_client_set_error_cb(vc_h vc, vc_error_cb callback, void* user_data);
 int vc_mgr_client_get_error_cb(vc_h vc, vc_error_cb* callback, void** user_data);
 
 
-/* 
-* set/get option 
+/*
+* set/get option
 */
 int vc_mgr_client_set_service_state(vc_h vc, vc_service_state_e state);
 
index 5121870..3986af5 100644 (file)
@@ -387,14 +387,14 @@ int vc_mgr_dbus_open_connection()
        /* connect to the DBUS system bus, and check for errors */
        g_m_conn_listener = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
 
-       if (dbus_error_is_set(&err)) { 
-               SLOG(LOG_ERROR, TAG_VCM, "Dbus Connection Error (%s)", err.message); 
-               dbus_error_free(&err); 
+       if (dbus_error_is_set(&err)) {
+               SLOG(LOG_ERROR, TAG_VCM, "Dbus Connection Error (%s)", err.message);
+               dbus_error_free(&err);
        }
 
        if (NULL == g_m_conn_listener) {
                SLOG(LOG_ERROR, TAG_VCM, "Fail to get dbus connection ");
-               return VC_ERROR_OPERATION_FAILED; 
+               return VC_ERROR_OPERATION_FAILED;
        }
 
        int pid = getpid();
@@ -409,8 +409,8 @@ int vc_mgr_dbus_open_connection()
        ret = dbus_bus_request_name(g_m_conn_listener, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
 
        if (dbus_error_is_set(&err)) {
-               SLOG(LOG_ERROR, TAG_VCM, "Name Error (%s)", err.message); 
-               dbus_error_free(&err); 
+               SLOG(LOG_ERROR, TAG_VCM, "Name Error (%s)", err.message);
+               dbus_error_free(&err);
        }
 
        if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
@@ -423,18 +423,17 @@ int vc_mgr_dbus_open_connection()
                return 0;
        }
 
-       char rule[128];
+       char rule[128] = {0, };
        snprintf(rule, 128, "type='signal',interface='%s'", VC_MANAGER_SERVICE_INTERFACE);
 
        /* add a rule for which messages we want to see */
        dbus_bus_add_match(g_m_conn_listener, rule, &err);
        dbus_connection_flush(g_m_conn_listener);
 
-       if (dbus_error_is_set(&err)) 
-       { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCM, "Match Error (%s)", err.message);
                dbus_error_free(&err);
-               return VC_ERROR_OPERATION_FAILED; 
+               return VC_ERROR_OPERATION_FAILED;
        }
 
        int fd = 0;
@@ -511,15 +510,15 @@ int vc_mgr_dbus_request_hello()
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_HELLO);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_HELLO);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> Request vc hello : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> Request vc hello : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
-       } 
+       }
 
        DBusError err;
        dbus_error_init(&err);
@@ -551,19 +550,19 @@ int vc_mgr_dbus_request_initialize(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_MANAGER_METHOD_INITIALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_INITIALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr initialize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr initialize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr initialize : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
+       dbus_message_append_args(msg,
                DBUS_TYPE_INT32, &pid,
                DBUS_TYPE_INVALID);
 
@@ -586,9 +585,9 @@ int vc_mgr_dbus_request_initialize(int pid)
                        DBUS_TYPE_INT32, &result, 
                        DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -613,13 +612,13 @@ int vc_mgr_dbus_request_finalize(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_MANAGER_METHOD_FINALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_FINALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr finalize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr finalize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr finalize : pid(%d)", pid);
@@ -642,13 +641,13 @@ int vc_mgr_dbus_request_finalize(int pid)
        }
 
        if (NULL != result_msg) {
-               dbus_message_get_args(result_msg, &err, 
-                               DBUS_TYPE_INT32, &result,
-                               DBUS_TYPE_INVALID);
+               dbus_message_get_args(result_msg, &err,
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -673,21 +672,21 @@ int vc_mgr_dbus_request_set_command(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_MANAGER_METHOD_SET_COMMAND);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_SET_COMMAND);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set command : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set command : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr set command : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -705,12 +704,12 @@ int vc_mgr_dbus_request_set_command(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -726,7 +725,7 @@ int vc_mgr_dbus_request_set_command(int pid)
                result = VC_ERROR_TIMED_OUT;
        }
 
-       return result;  
+       return result;
 }
 
 int vc_mgr_dbus_request_unset_command(int pid)
@@ -734,21 +733,21 @@ int vc_mgr_dbus_request_unset_command(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_MANAGER_METHOD_UNSET_COMMAND);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_UNSET_COMMAND);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr unset command : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr unset command : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr unset command : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -766,12 +765,12 @@ int vc_mgr_dbus_request_unset_command(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -795,21 +794,21 @@ int vc_mgr_dbus_request_demandable_client(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_MANAGER_METHOD_SET_DEMANDABLE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_SET_DEMANDABLE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set demandable client : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set demandable client : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr set demandable client : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -827,12 +826,12 @@ int vc_mgr_dbus_request_demandable_client(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -857,22 +856,22 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_MANAGER_METHOD_SET_AUDIO_TYPE);              
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_SET_AUDIO_TYPE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set audio type : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set audio type : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr set audio type : pid(%d), audio type(%s)", pid, audio_type);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_STRING, &(audio_type),
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_STRING, &(audio_type),
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -890,12 +889,12 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -920,21 +919,21 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_MANAGER_METHOD_GET_AUDIO_TYPE);              
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_GET_AUDIO_TYPE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get audio type : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get audio type : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr get audio type : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -953,13 +952,13 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_STRING, &temp,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_STRING, &temp,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -987,21 +986,21 @@ int vc_mgr_dbus_request_set_client_info(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_MANAGER_METHOD_SET_CLIENT_INFO);             
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_SET_CLIENT_INFO);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set client info : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set client info : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr set client info : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -1019,12 +1018,12 @@ int vc_mgr_dbus_request_set_client_info(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1049,13 +1048,13 @@ int vc_mgr_dbus_request_start(int pid, int silence, bool exclusive_command_optio
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_MANAGER_METHOD_START);               
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_START);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr start : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr start : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr start : pid(%d), silence(%d) exclusive(%d) start by client(%d)", 
@@ -1088,12 +1087,12 @@ int vc_mgr_dbus_request_start(int pid, int silence, bool exclusive_command_optio
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1118,21 +1117,21 @@ int vc_mgr_dbus_request_stop(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_MANAGER_METHOD_STOP);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_MANAGER_METHOD_STOP);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr stop : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr stop : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr stop : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -1150,12 +1149,12 @@ int vc_mgr_dbus_request_stop(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1180,21 +1179,21 @@ int vc_mgr_dbus_request_cancel(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  /* object name of the signal */
-               VC_SERVER_SERVICE_INTERFACE,    /* interface name of the signal */
-               VC_MANAGER_METHOD_CANCEL);      /* name of the signal */
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,        /* object name of the signal */
+                         VC_SERVER_SERVICE_INTERFACE,  /* interface name of the signal */
+                         VC_MANAGER_METHOD_CANCEL);    /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc cancel : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc cancel : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc cancel : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -1212,12 +1211,12 @@ int vc_mgr_dbus_request_cancel(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -1245,7 +1244,7 @@ static DBusMessage* __get_message(int pid, const char* method, int type)
        memset(service_name, '\0', 64);
        memset(object_path, '\0', 64);
        memset(target_if_name, '\0', 128);
-       
+
        if (VC_COMMAND_TYPE_FOREGROUND == type || VC_COMMAND_TYPE_BACKGROUND == type) {
                snprintf(service_name, 64, "%s", VC_CLIENT_SERVICE_NAME);
                snprintf(object_path, 64, "%s", VC_CLIENT_SERVICE_OBJECT_PATH);
@@ -1270,7 +1269,7 @@ int vc_mgr_dbus_send_result(int pid, int cmd_type, int result_id)
 
        switch (cmd_type) {
        case VC_COMMAND_TYPE_FOREGROUND:
-       case VC_COMMAND_TYPE_BACKGROUND:        
+       case VC_COMMAND_TYPE_BACKGROUND:
                msg = __get_message(pid, VCD_METHOD_RESULT, cmd_type);
                break;
        case VC_COMMAND_TYPE_WIDGET:
@@ -1308,21 +1307,21 @@ int vc_mgr_dbus_send_result_selection(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  /* object name of the signal */
-               VC_SERVER_SERVICE_INTERFACE,    /* interface name of the signal */
-               VC_MANAGER_METHOD_RESULT_SELECTION);    /* name of the signal */
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,        /* object name of the signal */
+                         VC_SERVER_SERVICE_INTERFACE,  /* interface name of the signal */
+                         VC_MANAGER_METHOD_RESULT_SELECTION);  /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc result selection : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCM, ">>>> vc result selection : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc result selection : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        dbus_message_set_no_reply(msg, TRUE);
 
index c0608c1..ad74725 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_DBUS_H_
 #define __VC_DBUS_H_
 
index 64f0453..abcc54e 100644 (file)
 #include "voice_control_common.h"
 #include "voice_control_setting.h"
 
-/** 
+/**
 * @brief Enumerations of mode.
 */
 typedef enum {
        VC_SETTING_STATE_NONE = 0,
        VC_SETTING_STATE_READY
-}vc_setting_state_e;
+} vc_setting_state_e;
 
 #define VC_SETTING_CONFIG_HANDLE       300000
 
@@ -49,8 +49,8 @@ void __config_lang_changed_cb(const char* before_lang, const char* current_lang)
 
 void __vc_setting_state_changed_cb(int before_state, int current_state, void* user_data)
 {
-       SLOG(LOG_DEBUG, TAG_VCS, "Service State changed : Before(%d) Current(%d)", 
-               before_state, current_state);
+       SLOG(LOG_DEBUG, TAG_VCS, "Service State changed : Before(%d) Current(%d)",
+                before_state, current_state);
        return;
 }
 
@@ -83,7 +83,7 @@ int vc_setting_initialize(void)
                SLOG(LOG_DEBUG, TAG_VCS, " ");
                return VC_ERROR_OPERATION_FAILED;
        }
-       
+
        ret = vc_config_mgr_set_lang_cb(getpid() + VC_SETTING_CONFIG_HANDLE, __config_lang_changed_cb);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Fail to initialize config manager");
@@ -93,7 +93,7 @@ int vc_setting_initialize(void)
        }
 
        ret = vc_config_mgr_set_enabled_cb(getpid() + VC_SETTING_CONFIG_HANDLE, __vc_setting_enabled_changed_cb);
-       
+
        g_state = VC_SETTING_STATE_READY;
 
        SLOG(LOG_DEBUG, TAG_VCS, "=====");
@@ -110,7 +110,7 @@ int vc_setting_deinitialize()
        vc_config_mgr_finalize(getpid() + VC_SETTING_CONFIG_HANDLE);
 
        g_state = VC_SETTING_STATE_NONE;
-       
+
        SLOG(LOG_DEBUG, TAG_VCS, "=====");
        SLOG(LOG_DEBUG, TAG_VCS, " ");
 
@@ -206,7 +206,7 @@ int vc_setting_set_language(const char* language)
 
        SLOG(LOG_DEBUG, TAG_VCS, "=====");
        SLOG(LOG_DEBUG, TAG_VCS, " ");
-    
+
        return ret;
 }
 
@@ -263,7 +263,7 @@ int vc_setting_get_auto_language(bool* value)
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Result : %d", ret);
        } else {
-               SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get auto language (%s)", *value ? "true":"false");
+               SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get auto language (%s)", *value ? "true" : "false");
        }
 
        SLOG(LOG_DEBUG, TAG_VCS, "=====");
index b7a3537..70253c7 100644 (file)
@@ -45,7 +45,7 @@ const char* vc_tag()
 
 static const char* __vc_widget_get_error_code(vc_error_e err)
 {
-       switch(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;
@@ -75,8 +75,8 @@ static int __vc_widget_convert_config_error_code(vc_config_error_e code)
 
 static void __vc_widget_lang_changed_cb(const char* before_lang, const char* current_lang)
 {
-       SECURE_SLOG(LOG_DEBUG, TAG_VCW, "Lang changed : Before lang(%s) Current lang(%s)", 
-               before_lang, current_lang);
+       SLOG(LOG_DEBUG, TAG_VCW, "Lang changed : Before lang(%s) Current lang(%s)",
+                before_lang, current_lang);
 
        vc_current_language_changed_cb callback;
        void* lang_user_data;
@@ -145,8 +145,8 @@ int vc_widget_initialize()
 
        int ret = vc_config_mgr_initialize(g_vc_w->handle + VC_WIDGET_CONFIG_HANDLE);
        if (0 != ret) {
-               SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to init config manager : %s", 
-                       __vc_widget_get_error_code(__vc_widget_convert_config_error_code(ret)));
+               SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to init config manager : %s",
+                        __vc_widget_get_error_code(__vc_widget_convert_config_error_code(ret)));
                vc_widget_client_destroy(g_vc_w);
                return __vc_widget_convert_config_error_code(ret);
        }
@@ -281,7 +281,7 @@ static Eina_Bool __vc_widget_connect_daemon(void *data)
                SLOG(LOG_DEBUG, TAG_VCW, "=====");
                SLOG(LOG_DEBUG, TAG_VCW, "  ");
                return EINA_FALSE;
-       } 
+       }
 
        vc_widget_client_set_state(g_vc_w, VC_STATE_READY);
        ecore_timer_add(0, __vc_widget_notify_state_changed, g_vc_w);
@@ -378,7 +378,7 @@ int vc_widget_foreach_supported_languages(vc_supported_language_cb callback, voi
                ret = vc_config_convert_error_code((vc_config_error_e)ret);
                SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get languages : %s", __vc_widget_get_error_code(ret));
        }
-       
+
        SLOG(LOG_DEBUG, TAG_VCW, "=====");
        SLOG(LOG_DEBUG, TAG_VCW, " ");
 
@@ -436,7 +436,7 @@ int vc_widget_get_state(vc_state_e* state)
 
        *state = temp;
 
-       switch(*state) {
+       switch (*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;
@@ -482,12 +482,12 @@ int vc_widget_get_service_state(vc_service_state_e* state)
 
        *state = service_state;
 
-       switch(*state) {
-       case VC_SERVICE_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCW, "Current service state is 'None'");            break;
-       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;
+       switch (*state) {
+               case VC_SERVICE_STATE_NONE:             SLOG(LOG_DEBUG, TAG_VCW, "Current service state is 'None'");            break;
+               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;
        }
 
        SLOG(LOG_DEBUG, TAG_VCW, "=====");
@@ -646,7 +646,7 @@ int vc_widget_start(bool stop_by_silence, vc_cmd_group_h vc_group)
                                        }
                                }
                        }
-               } while(0 != ret);
+               } while (0 != ret);
        }
 
        SLOG(LOG_DEBUG, TAG_VCW, "=====");
@@ -732,7 +732,7 @@ int vc_widget_stop()
                                }
                        }
                }
-       } while(0 != ret);
+       } while (0 != ret);
 
        return 0;
 }
@@ -798,7 +798,9 @@ int vc_widget_cancel()
                                }
                        }
                }
-       } while(0 != ret);
+       } while (0 != ret);
+
+       SLOG(LOG_DEBUG, TAG_VCW, "=====");
 
        return 0;
 }
@@ -820,7 +822,7 @@ static Eina_Bool __vc_widget_notify_error(void *data)
                SLOG(LOG_DEBUG, TAG_VCW, "[Error] callback is called");
        } else {
                SLOG(LOG_WARN, TAG_VCW, "[WARNING] Error callback is null");
-       }  
+       }
 
        return EINA_FALSE;
 }
@@ -1033,7 +1035,7 @@ int vc_widget_set_result_cb(vc_result_cb callback, void* user_data)
        }
 
        vc_widget_client_set_result_cb(g_vc_w, callback, user_data);
-       
+
        return 0;
 }
 
index a48d3d3..1edee3f 100644 (file)
@@ -59,7 +59,7 @@ typedef struct {
 
        /* error data */
        int     reason;
-}vc_widget_s;
+} vc_widget_s;
 
 
 /* widget list */
@@ -77,7 +77,7 @@ static vc_widget_s* __widget_get(vc_h vc)
        int count = g_slist_length(g_widget_list);
        int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_widget_list, i);
 
                if (NULL != data) {
@@ -109,11 +109,11 @@ int vc_widget_client_create(vc_h* vc)
                return VC_ERROR_OUT_OF_MEMORY;
        }
 
-       temp->handle = getpid(); 
+       temp->handle = getpid();
 
        /* initialize widget data */
        widget->vc = temp;
-       widget->pid = getpid(); 
+       widget->pid = getpid();
        widget->uid = temp->handle;
        widget->xid = -1;
 
@@ -128,8 +128,8 @@ int vc_widget_client_create(vc_h* vc)
        widget->error_cb = NULL;
        widget->error_user_data = NULL;
 
-       widget->before_state = VC_STATE_INITIALIZED; 
-       widget->current_state = VC_STATE_INITIALIZED; 
+       widget->before_state = VC_STATE_INITIALIZED;
+       widget->current_state = VC_STATE_INITIALIZED;
 
        widget->cb_ref_count = 0;
 
@@ -145,22 +145,21 @@ int vc_widget_client_destroy(vc_h vc)
        if (vc == NULL) {
                SLOG(LOG_ERROR, TAG_VCW, "Input parameter is NULL");
                return 0;
-       }       
+       }
 
        vc_widget_s *data = NULL;
 
        int count = g_slist_length(g_widget_list);
        int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_widget_list, i);
 
                if (NULL != data) {
                        if (vc->handle == data->vc->handle) {
                                g_widget_list =  g_slist_remove(g_widget_list, data);
 
-                               while (0 != data->cb_ref_count)
-                               {
+                               while (0 != data->cb_ref_count) {
                                        /* wait for release callback function */
                                }
                                free(data);
@@ -196,11 +195,11 @@ bool vc_widget_client_is_valid_by_uid(int uid)
        int count = g_slist_length(g_widget_list);
        int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_widget_list, i);
 
                if (NULL != data) {
-                       if (uid == data->vc->handle) 
+                       if (uid == data->vc->handle)
                                return true;
                }
        }
@@ -217,7 +216,7 @@ int vc_widget_client_get_handle(int uid, vc_h* vc)
        int count = g_slist_length(g_widget_list);
        int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_widget_list, i);
 
                if (NULL != data) {
@@ -227,7 +226,7 @@ int vc_widget_client_get_handle(int uid, vc_h* vc)
                        }
                }
        }
-       
+
        return -1;
 }
 
@@ -237,7 +236,7 @@ int vc_widget_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_da
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->result_cb = callback;
@@ -251,13 +250,13 @@ int vc_widget_client_get_result_cb(vc_h vc, vc_result_cb* callback, void** user_
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->result_cb;
        *user_data = widget->result_user_data;
 
-       return 0;       
+       return 0;
 }
 
 int vc_widget_client_set_service_state_changed_cb(vc_h vc, vc_service_state_changed_cb callback, void* user_data)
@@ -265,7 +264,7 @@ int vc_widget_client_set_service_state_changed_cb(vc_h vc, vc_service_state_chan
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->service_state_changed_cb = callback;
@@ -279,7 +278,7 @@ int vc_widget_client_get_service_state_changed_cb(vc_h vc, vc_service_state_chan
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->service_state_changed_cb;
@@ -293,7 +292,7 @@ int vc_widget_client_set_state_changed_cb(vc_h vc, vc_state_changed_cb callback,
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->state_changed_cb = callback;
@@ -307,7 +306,7 @@ int vc_widget_client_get_state_changed_cb(vc_h vc, vc_state_changed_cb* callback
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->state_changed_cb;
@@ -321,7 +320,7 @@ int vc_widget_client_set_show_tooltip_cb(vc_h vc, vc_widget_show_tooltip_cb call
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->show_tooltip_cb = callback;
@@ -335,7 +334,7 @@ int vc_widget_client_get_show_tooltip_cb(vc_h vc, vc_widget_show_tooltip_cb* cal
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->show_tooltip_cb;
@@ -349,7 +348,7 @@ int vc_widget_client_set_current_lang_changed_cb(vc_h vc, vc_current_language_ch
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->current_lang_changed_cb = callback;
@@ -363,7 +362,7 @@ int vc_widget_client_get_current_lang_changed_cb(vc_h vc, vc_current_language_ch
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->current_lang_changed_cb;
@@ -377,7 +376,7 @@ int vc_widget_client_set_error_cb(vc_h vc, vc_error_cb callback, void* user_data
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->error_cb = callback;
@@ -391,7 +390,7 @@ int vc_widget_client_get_error_cb(vc_h vc, vc_error_cb* callback, void** user_da
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->error_cb;
@@ -405,7 +404,7 @@ int vc_widget_client_set_send_command_list_cb(vc_h vc, vc_widget_send_current_co
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->send_command_list_cb = callback;
@@ -419,7 +418,7 @@ int vc_widget_client_get_send_command_list_cb(vc_h vc, vc_widget_send_current_co
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *callback = widget->send_command_list_cb;
@@ -435,7 +434,7 @@ int vc_widget_client_set_service_state(vc_h vc, vc_service_state_e state)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->service_state = state;
@@ -448,7 +447,7 @@ int vc_widget_client_get_service_state(vc_h vc, vc_service_state_e* state)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = widget->service_state;
@@ -462,7 +461,7 @@ int vc_widget_client_set_state(vc_h vc, vc_state_e state)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->before_state = widget->current_state;
@@ -476,7 +475,7 @@ int vc_widget_client_get_state(vc_h vc, vc_state_e* state)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *state = widget->current_state;
@@ -491,7 +490,7 @@ int vc_widget_client_get_state_by_uid(int uid, vc_state_e* state)
        int count = g_slist_length(g_widget_list);
        int i;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                data = g_slist_nth_data(g_widget_list, i);
 
                if (NULL != data) {
@@ -510,7 +509,7 @@ int vc_widget_client_get_before_state(vc_h vc, vc_state_e* state, vc_state_e* be
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *before_state = widget->before_state;
@@ -524,7 +523,7 @@ int vc_widget_client_set_xid(vc_h vc, int xid)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->xid = xid;
@@ -537,7 +536,7 @@ int vc_widget_cilent_get_xid(vc_h vc, int* xid)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *xid = widget->xid;
@@ -550,7 +549,7 @@ int vc_widget_client_set_error(vc_h vc, int reason)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->reason = reason;
@@ -563,7 +562,7 @@ int vc_widget_client_get_error(vc_h vc, int* reason)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *reason = widget->reason;
@@ -576,11 +575,11 @@ int vc_widget_client_set_show_tooltip(vc_h vc, bool show)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->show_tooltip = show;
-       
+
        return 0;
 }
 
@@ -589,11 +588,11 @@ int vc_widget_client_get_show_tooltip(vc_h vc, bool* show)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        *show = widget->show_tooltip;
-       
+
        return 0;
 }
 
@@ -607,7 +606,7 @@ int vc_widget_client_use_callback(vc_h vc)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->cb_ref_count++;
@@ -619,7 +618,7 @@ int vc_widget_client_not_use_callback(vc_h vc)
        vc_widget_s* widget = __widget_get(vc);
 
        /* check handle */
-       if (NULL == widget) 
+       if (NULL == widget)
                return VC_ERROR_INVALID_PARAMETER;
 
        widget->cb_ref_count--;
index 828038c..12a2a85 100644 (file)
@@ -25,8 +25,8 @@
 extern "C" {
 #endif
 
-/* 
-* Common function 
+/*
+* Common function
 */
 int vc_widget_client_create(vc_h* vc);
 
@@ -38,8 +38,8 @@ bool vc_widget_client_is_valid_by_uid(int uid);
 
 int vc_widget_client_get_handle(int uid, vc_h* vc);
 
-/* 
-* set/get callback function 
+/*
+* set/get callback function
 */
 int vc_widget_client_set_result_cb(vc_h vc, vc_result_cb callback, void* user_data);
 
@@ -71,8 +71,8 @@ int vc_widget_client_get_send_command_list_cb(vc_h vc, vc_widget_send_current_co
 
 
 
-/* 
-* set/get option 
+/*
+* set/get option
 */
 int vc_widget_client_set_service_state(vc_h vc, vc_service_state_e state);
 
index 0d1df58..3059cad 100644 (file)
@@ -211,8 +211,8 @@ int vc_widget_dbus_open_connection()
        ret = dbus_bus_request_name(g_w_conn_listener, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING , &err);
 
        if (dbus_error_is_set(&err)) {
-               SLOG(LOG_ERROR, TAG_VCW, "Name Error (%s)", err.message); 
-               dbus_error_free(&err); 
+               SLOG(LOG_ERROR, TAG_VCW, "Name Error (%s)", err.message);
+               dbus_error_free(&err);
        }
 
        if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
@@ -220,23 +220,22 @@ int vc_widget_dbus_open_connection()
                return -2;
        }
 
-       if( NULL != g_w_fd_handler ) {
+       if (NULL != g_w_fd_handler) {
                SLOG(LOG_WARN, TAG_VCW, "The handler already exists.");
                return 0;
        }
 
-       char rule[128];
+       char rule[128] = {0, };
        snprintf(rule, 128, "type='signal',interface='%s'", VC_WIDGET_SERVICE_INTERFACE);
 
        /* add a rule for which messages we want to see */
        dbus_bus_add_match(g_w_conn_listener, rule, &err);
        dbus_connection_flush(g_w_conn_listener);
 
-       if (dbus_error_is_set(&err)) 
-       { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCW, "Match Error (%s)", err.message);
                dbus_error_free(&err);
-               return VC_ERROR_OPERATION_FAILED; 
+               return VC_ERROR_OPERATION_FAILED;
        }
 
        int fd = 0;
@@ -312,15 +311,15 @@ int vc_widget_dbus_request_hello()
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_METHOD_HELLO);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_METHOD_HELLO);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> Request vc hello : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> Request vc hello : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
-       } 
+       }
 
        DBusError err;
        dbus_error_init(&err);
@@ -352,21 +351,21 @@ int vc_widget_dbus_request_initialize(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_WIDGET_METHOD_INITIALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_WIDGET_METHOD_INITIALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget initialize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget initialize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget initialize : pid(%d)", pid);
        }
 
-       dbus_message_append_args( msg, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -383,13 +382,13 @@ int vc_widget_dbus_request_initialize(int pid)
        }
 
        if (NULL != result_msg) {
-               dbus_message_get_args(result_msg, &err, 
-                       DBUS_TYPE_INT32, &result, 
+               dbus_message_get_args(result_msg, &err,
+                       DBUS_TYPE_INT32, &result,
                        DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -414,13 +413,13 @@ int vc_widget_dbus_request_finalize(int pid)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_WIDGET_METHOD_FINALIZE);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_WIDGET_METHOD_FINALIZE);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget finalize : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget finalize : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget finalize : pid(%d)", pid);
@@ -443,13 +442,13 @@ int vc_widget_dbus_request_finalize(int pid)
        }
 
        if (NULL != result_msg) {
-               dbus_message_get_args(result_msg, &err, 
-                               DBUS_TYPE_INT32, &result,
-                               DBUS_TYPE_INVALID);
+               dbus_message_get_args(result_msg, &err,
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
 
@@ -474,13 +473,13 @@ int vc_widget_dbus_request_start_recording(int pid, bool command)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME, 
-               VC_SERVER_SERVICE_OBJECT_PATH, 
-               VC_SERVER_SERVICE_INTERFACE, 
-               VC_WIDGET_METHOD_START_RECORDING);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_WIDGET_METHOD_START_RECORDING);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start recording : Fail to make message"); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start recording : Fail to make message");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget start recording : pid(%d)", pid);
@@ -488,10 +487,10 @@ int vc_widget_dbus_request_start_recording(int pid, bool command)
 
        int temp = (int)command;
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INT32, &temp, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INT32, &temp,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -510,9 +509,9 @@ int vc_widget_dbus_request_start_recording(int pid, bool command)
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -537,13 +536,13 @@ int vc_widget_dbus_request_start(int pid, int silence)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_WIDGET_METHOD_START);                
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_WIDGET_METHOD_START);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget start : pid(%d), silence(%d)", pid, silence);
@@ -572,12 +571,12 @@ int vc_widget_dbus_request_start(int pid, int silence)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -602,21 +601,21 @@ int vc_widget_dbus_request_stop(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  
-               VC_SERVER_SERVICE_INTERFACE,    
-               VC_WIDGET_METHOD_STOP);
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,
+                         VC_SERVER_SERVICE_INTERFACE,
+                         VC_WIDGET_METHOD_STOP);
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget stop : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget stop : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget stop : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -634,12 +633,12 @@ int vc_widget_dbus_request_stop(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
@@ -664,21 +663,21 @@ int vc_widget_dbus_request_cancel(int pid)
 
        /* create a signal & check for errors */
        msg = dbus_message_new_method_call(
-               VC_SERVER_SERVICE_NAME,
-               VC_SERVER_SERVICE_OBJECT_PATH,  /* object name of the signal */
-               VC_SERVER_SERVICE_INTERFACE,    /* interface name of the signal */
-               VC_WIDGET_METHOD_CANCEL);       /* name of the signal */
+                         VC_SERVER_SERVICE_NAME,
+                         VC_SERVER_SERVICE_OBJECT_PATH,        /* object name of the signal */
+                         VC_SERVER_SERVICE_INTERFACE,  /* interface name of the signal */
+                         VC_WIDGET_METHOD_CANCEL);     /* name of the signal */
 
-       if (NULL == msg) { 
-               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget cancel : Fail to make message "); 
+       if (NULL == msg) {
+               SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget cancel : Fail to make message ");
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget cancel : pid(%d)", pid);
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -696,12 +695,12 @@ int vc_widget_dbus_request_cancel(int pid)
 
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err,
-                       DBUS_TYPE_INT32, &result,
-                       DBUS_TYPE_INVALID);
+                                                         DBUS_TYPE_INT32, &result,
+                                                         DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message);
-                       dbus_error_free(&err); 
+                       dbus_error_free(&err);
                        result = VC_ERROR_OPERATION_FAILED;
                }
                dbus_message_unref(result_msg);
index 65d0c56..e69209e 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_WIDGET_DBUS_H_
 #define __VC_WIDGET_DBUS_H_
 
index 7d570a2..c06d828 100644 (file)
@@ -176,14 +176,14 @@ int vc_cmd_list_remove_all(vc_cmd_list_h vc_cmd_list, bool release_command)
        list = (vc_cmd_list_s*)vc_cmd_list;
 
        SLOG(LOG_DEBUG, TAG_VCCMD, "[List] list (%p), release command (%s)"
-               , list, release_command ? "true" : "false");
+                , list, release_command ? "true" : "false");
 
        int count = g_slist_length(list->list);
 
        int i ;
        vc_cmd_s *temp_cmd;
 
-       for (i = 0;i < count ;i++) {
+       for (i = 0; i < count ; i++) {
                temp_cmd = g_slist_nth_data(list->list, 0);
 
                if (NULL != temp_cmd) {
@@ -196,7 +196,7 @@ int vc_cmd_list_remove_all(vc_cmd_list_h vc_cmd_list, bool release_command)
                                free(temp_cmd);
                                temp_cmd = NULL;
                        }
-               } 
+               }
        }
 
        list->index = -1;
@@ -225,7 +225,7 @@ int vc_cmd_list_foreach_commands(vc_cmd_list_h vc_cmd_list, vc_cmd_list_cb callb
 
        iter = g_slist_nth(list->list, 0);
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                temp_cmd = iter->data;
 
                if (NULL != temp_cmd) {
@@ -233,7 +233,7 @@ int vc_cmd_list_foreach_commands(vc_cmd_list_h vc_cmd_list, vc_cmd_list_cb callb
                                break;
                        }
 
-               } 
+               }
                iter = g_slist_next(iter);
        }
 
@@ -427,7 +427,7 @@ int vc_cmd_set_id(vc_cmd_h vc_command, int id)
                SLOG(LOG_DEBUG, TAG_VCCMD, "[Set id][%p] id(%d)", vc_command, cmd->id);
        }
 
-       return 0;       
+       return 0;
 }
 
 int vc_cmd_get_id(vc_cmd_h vc_command, int* id)
@@ -757,13 +757,13 @@ int vc_cmd_print_list(vc_cmd_list_h vc_cmd_list)
        int i;
        vc_cmd_s *temp_cmd = NULL;
 
-       for (i = 0;i < count ;i++) {
+       for (i = 0; i < count ; i++) {
                temp_cmd = g_slist_nth_data(list->list, i);
 
                if (NULL != temp_cmd) {
-                       SLOG(LOG_DEBUG, TAG_VCCMD, "  [%d][%p] PID(%d) ID(%d) Type(%d) Format(%d) Domain(%d) Command(%s) Param(%s)", 
-                               i, temp_cmd, temp_cmd->pid, temp_cmd->index, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
-               } 
+                       SLOG(LOG_DEBUG, TAG_VCCMD, "  [%d][%p] PID(%d) ID(%d) Type(%d) Format(%d) Domain(%d) Command(%s) Param(%s)",
+                                i, temp_cmd, temp_cmd->pid, temp_cmd->index, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
+               }
        }
 
        SLOG(LOG_DEBUG, TAG_VCCMD, "==================");
index b490f34..605edd6 100644 (file)
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-typedef struct _command_s{
+typedef struct _command_s {
        int     pid;
        int     id;
        int     index;
@@ -39,12 +39,12 @@ typedef struct _command_s{
        /* not used */
        int     key;
        int     modifier;
-}vc_cmd_s;
+} vc_cmd_s;
 
 typedef struct {
        int index;
        GSList* list;
-}vc_cmd_list_s;
+} vc_cmd_list_s;
 
 /**
 * @brief Enumerations of command type.
@@ -57,7 +57,7 @@ typedef enum {
        VC_COMMAND_TYPE_WIDGET = 3,     /**< Widget command by widget client */
        VC_COMMAND_TYPE_SYSTEM = 4,     /**< System command by manager client */
        VC_COMMAND_TYPE_EXCLUSIVE = 5   /**< exclusive command by manager client */
-}vc_cmd_type_e;
+} vc_cmd_type_e;
 
 
 int vc_cmd_set_id(vc_cmd_h vc_command, int id);
index 153d7ef..8eacee5 100644 (file)
@@ -41,7 +41,7 @@ typedef struct {
        vc_config_foreground_changed_cb foreground_cb;
        vc_config_state_changed_cb      state_cb;
        vc_config_enabled_cb            enabled_cb;
-}vc_config_client_s;
+} vc_config_client_s;
 
 
 const char* vc_config_tag()
@@ -153,7 +153,7 @@ int __vc_config_mgr_check_engine_is_valid(const char* engine_id)
                free(g_config_info->engine_id);
 
        g_config_info->engine_id = strdup(engine_info->uuid);
-       
+
        SLOG(LOG_DEBUG, vc_config_tag(), "Default engine is changed : %s", g_config_info->engine_id);
        if (0 != vc_parser_set_engine(g_config_info->engine_id)) {
                SLOG(LOG_ERROR, vc_config_tag(), " Fail to save config");
@@ -200,7 +200,7 @@ bool __vc_config_mgr_check_lang_is_valid(const char* engine_id, const char* lang
                        /* Get a first item */
                        iter_lang = g_slist_nth(engine_info->languages, 0);
 
-                       int i = 1;      
+                       int i = 1;
                        while (NULL != iter_lang) {
                                /*Get handle data from list*/
                                engine_lang = iter_lang->data;
@@ -252,13 +252,13 @@ int __vc_config_mgr_select_lang(const char* engine_id, char** language)
                        iter = g_slist_next(iter);
                        continue;
                }
-               
+
                GSList *iter_lang = NULL;
                char* engine_lang = NULL;
                if (g_slist_length(engine_info->languages) > 0) {
                        /* Get a first item */
                        iter_lang = g_slist_nth(engine_info->languages, 0);
-                       
+
                        while (NULL != iter_lang) {
                                engine_lang = iter_lang->data;
                                if (NULL != engine_lang) {
@@ -415,8 +415,8 @@ int __vc_config_set_auto_language()
                free(g_config_info->language);
                g_config_info->language = strdup(candidate_lang);
 
-               SLOG(LOG_DEBUG, vc_config_tag(), "[Config] Default language change : before(%s) current(%s)", 
-                       before_lang, g_config_info->language);
+               SLOG(LOG_DEBUG, vc_config_tag(), "[Config] Default language change : before(%s) current(%s)",
+                        before_lang, g_config_info->language);
 
                /* Call all callbacks of client*/
                GSList *iter = NULL;
@@ -465,8 +465,8 @@ int __vc_config_set_auto_language()
                }
                free(tmp_language);
 
-               SLOG(LOG_DEBUG, vc_config_tag(), "[Config] Default language change : before(%s) current(%s)", 
-                       before_lang, g_config_info->language);
+               SLOG(LOG_DEBUG, vc_config_tag(), "[Config] Default language change : before(%s) current(%s)",
+                        before_lang, g_config_info->language);
 
                /* Call all callbacks of client*/
                GSList *iter = NULL;
@@ -530,7 +530,7 @@ int vc_config_mgr_initialize(int uid)
                }
 
                temp_client->uid = uid;
-               
+
                /* Add uid */
                g_config_client_list = g_slist_append(g_config_client_list, temp_client);
 
@@ -668,7 +668,7 @@ int vc_config_mgr_initialize(int uid)
        }
 
        temp_client->uid = uid;
-       
+
        SLOG(LOG_DEBUG, vc_config_tag(), "uid(%d) temp_uid(%d)", uid, temp_client->uid);
 
        /* Add uid */
@@ -822,7 +822,7 @@ int vc_config_mgr_set_lang_cb(int uid, vc_config_lang_changed_cb lang_cb)
 }
 
 int vc_config_mgr_unset_lang_cb(int uid)
-{      
+{
        GSList *iter = NULL;
        vc_config_client_s* temp_client = NULL;
 
@@ -1075,15 +1075,15 @@ int __vc_config_mgr_register_foreground_event()
                wd = inotify_add_watch(g_fd_fore, VC_RUNTIME_INFO_FOREGROUND, IN_CLOSE_WRITE);
                g_wd_fore = wd;
 
-               g_fd_handler_fore = ecore_main_fd_handler_add(g_fd_fore, ECORE_FD_READ, 
-                       (Ecore_Fd_Cb)vc_config_mgr_inotify_foreground_cb, NULL, NULL, NULL);            
+               g_fd_handler_fore = ecore_main_fd_handler_add(g_fd_fore, ECORE_FD_READ, (Ecore_Fd_Cb)vc_config_mgr_inotify_foreground_cb, 
+                                                                                                         NULL, NULL, NULL);
                if (NULL == g_fd_handler_fore) {
                        SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to get handler for foreground");
                        return -1;
                }
        }
        g_fore_ref_count++;
-       
+
        return 0;
 }
 
@@ -1255,7 +1255,7 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use
                SLOG(LOG_ERROR, vc_config_tag(), "Not initialized");
                return -1;
        }
-       
+
        if (0 >= g_slist_length(g_engine_list)) {
                SLOG(LOG_ERROR, vc_config_tag(), "There is no engine");
                return -1;
@@ -1282,7 +1282,7 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use
 
                GSList *iter_lang = NULL;
                char* lang;
-               
+
                /* Get a first item */
                iter_lang = g_slist_nth(engine_info->languages, 0);
 
@@ -1295,7 +1295,7 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use
                                if (false == callback(lang, user_data))
                                        break;
                        }
-                       
+
                        /*Get next item*/
                        iter_lang = g_slist_next(iter_lang);
                }
@@ -1441,7 +1441,7 @@ bool vc_config_check_default_engine_is_valid(const char* engine)
                return false;
        }
 
-       if (0 >= g_slist_length(g_engine_list)) 
+       if (0 >= g_slist_length(g_engine_list))
                return false;
 
        GSList *iter = NULL;
@@ -1480,7 +1480,7 @@ bool vc_config_check_default_language_is_valid(const char* language)
                return false;
        }
 
-       if (0 >= g_slist_length(g_engine_list)) 
+       if (0 >= g_slist_length(g_engine_list))
                return false;
 
        GSList *iter = NULL;
@@ -1497,7 +1497,7 @@ bool vc_config_check_default_language_is_valid(const char* language)
                        iter = g_slist_next(iter);
                        continue;
                }
-               
+
                if (0 == strcmp(g_config_info->engine_id, engine_info->uuid)) {
                        iter = g_slist_next(iter);
                        continue;
@@ -1511,7 +1511,7 @@ bool vc_config_check_default_language_is_valid(const char* language)
 
                while (NULL != iter_lang) {
                        lang = iter_lang->data;
-                       
+
                        if (0 == strcmp(language, lang))
                                return true;
 
@@ -1583,14 +1583,14 @@ int __vc_config_mgr_print_engine_info()
 
        SLOG(LOG_DEBUG, vc_config_tag(), "--------------- engine list -----------------");
 
-       int i = 1;      
+       int i = 1;
        while (NULL != iter) {
                engine_info = iter->data;
 
                SLOG(LOG_DEBUG, vc_config_tag(), "[%dth]", i);
                SLOG(LOG_DEBUG, vc_config_tag(), " name : %s", engine_info->name);
                SLOG(LOG_DEBUG, vc_config_tag(), " id   : %s", engine_info->uuid);
-               
+
 
                SLOG(LOG_DEBUG, vc_config_tag(), " languages");
                GSList *iter_lang = NULL;
@@ -1599,7 +1599,7 @@ int __vc_config_mgr_print_engine_info()
                        /* Get a first item */
                        iter_lang = g_slist_nth(engine_info->languages, 0);
 
-                       int j = 1;      
+                       int j = 1;
                        while (NULL != iter_lang) {
                                /*Get handle data from list*/
                                lang = iter_lang->data;
@@ -1639,12 +1639,12 @@ int __vc_config_mgr_print_client_info()
 
        SLOG(LOG_DEBUG, vc_config_tag(), "--------------- Client list -----------------");
 
-       int i = 1;      
+       int i = 1;
        while (NULL != iter) {
                temp_client = iter->data;
 
                SLOG(LOG_DEBUG, vc_config_tag(), "[%dth] uid(%d)", i, temp_client->uid);
-               
+
                iter = g_slist_next(iter);
                i++;
        }
index 171e0e2..32fb8b1 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_CONFIG_MANAGER_H_
 #define __VC_CONFIG_MANAGER_H_
 
@@ -34,7 +34,7 @@ typedef enum {
        VC_CONFIG_ERROR_INVALID_LANGUAGE        = TIZEN_ERROR_VOICE_CONTROL | 0x012,    /**< Invalid voice */
        VC_CONFIG_ERROR_ENGINE_NOT_FOUND        = TIZEN_ERROR_VOICE_CONTROL | 0x013,    /**< No available VC-engine  */
        VC_CONFIG_ERROR_OPERATION_FAILED        = TIZEN_ERROR_VOICE_CONTROL | 0x014     /**< Operation failed  */
-}vc_config_error_e;
+} vc_config_error_e;
 
 
 typedef void (*vc_config_lang_changed_cb)(const char* before_lang, const char* current_lang);
index 881843f..3a463fa 100644 (file)
@@ -123,7 +123,7 @@ int vc_parser_get_engine_info(const char* path, vc_engine_info_s** engine_info)
                if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_ENGINE_NAME)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               // SLOG(LOG_DEBUG, vc_config_tag(), "Engine name : %s", (char *)key);
+                               /* SLOG(LOG_DEBUG, vc_config_tag(), "Engine name : %s", (char *)key); */
                                if (NULL != temp->name) free(temp->name);
                                temp->name = strdup((char*)key);
                                xmlFree(key);
@@ -133,7 +133,7 @@ int vc_parser_get_engine_info(const char* path, vc_engine_info_s** engine_info)
                } else if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_ENGINE_ID)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               // SLOG(LOG_DEBUG, vc_config_tag(), "Engine uuid : %s", (char *)key);
+                               /* SLOG(LOG_DEBUG, vc_config_tag(), "Engine uuid : %s", (char *)key); */
                                if (NULL != temp->uuid) free(temp->uuid);
                                temp->uuid = strdup((char*)key);
                                xmlFree(key);
@@ -147,10 +147,10 @@ int vc_parser_get_engine_info(const char* path, vc_engine_info_s** engine_info)
                        lang_node = cur->xmlChildrenNode;
 
                        while (lang_node != NULL) {
-                               if (0 == xmlStrcmp(lang_node->name, (const xmlChar *)VC_TAG_ENGINE_LANGUAGE)){
+                               if (0 == xmlStrcmp(lang_node->name, (const xmlChar *)VC_TAG_ENGINE_LANGUAGE)) {
                                        key = xmlNodeGetContent(lang_node);
                                        if (NULL != key) {
-                                               // SLOG(LOG_DEBUG, vc_config_tag(), "language : %s", (char *)key);
+                                               /* SLOG(LOG_DEBUG, vc_config_tag(), "language : %s", (char *)key); */
                                                temp_lang = strdup((char*)key);
                                                temp->languages = g_slist_append(temp->languages, temp_lang);
                                                xmlFree(key);
@@ -164,7 +164,7 @@ int vc_parser_get_engine_info(const char* path, vc_engine_info_s** engine_info)
                } else if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_ENGINE_NON_FIXED_SUPPORT)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               // SLOG(LOG_DEBUG, vc_config_tag(), "Engine uuid : %s", (char *)key);
+                               /* SLOG(LOG_DEBUG, vc_config_tag(), "Engine uuid : %s", (char *)key); */
 
                                if (0 == xmlStrcmp(key, (const xmlChar *)"true")) {
                                        temp->non_fixed_support = true;
@@ -214,7 +214,7 @@ int vc_parser_free_engine_info(vc_engine_info_s* engine_info)
        int i ;
        char *temp_lang;
 
-       for (i = 0;i < count ;i++) {
+       for (i = 0; i < count ; i++) {
                temp_lang = g_slist_nth_data(engine_info->languages, 0);
 
                if (NULL != temp_lang) {
@@ -222,12 +222,12 @@ int vc_parser_free_engine_info(vc_engine_info_s* engine_info)
 
                        if (NULL != temp_lang)
                                free(temp_lang);
-               } 
+               }
        }
 
        if (NULL != engine_info)        free(engine_info);
 
-       return 0;       
+       return 0;
 }
 
 int vc_parser_print_engine_info(vc_engine_info_s* engine_info)
@@ -237,7 +237,7 @@ int vc_parser_print_engine_info(vc_engine_info_s* engine_info)
 
        SLOG(LOG_DEBUG, vc_config_tag(), "== engine info ==");
        SLOG(LOG_DEBUG, vc_config_tag(), " id   : %s", engine_info->uuid);
-       
+
        SLOG(LOG_DEBUG, vc_config_tag(), " languages");
        GSList *iter = NULL;
        char* lang;
@@ -245,7 +245,7 @@ int vc_parser_print_engine_info(vc_engine_info_s* engine_info)
                /* Get a first item */
                iter = g_slist_nth(engine_info->languages, 0);
 
-               int i = 1;      
+               int i = 1;
                while (NULL != iter) {
                        /*Get handle data from list*/
                        lang = iter->data;
@@ -351,7 +351,7 @@ int vc_parser_load_config(vc_config_s** config_info)
                if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_CONFIG_ENGINE_ID)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_config_tag(), "Engine id : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_config_tag(), "Engine id : %s", (char *)key); */
                                if (NULL != temp->engine_id)    free(temp->engine_id);
                                temp->engine_id = strdup((char*)key);
                                xmlFree(key);
@@ -379,7 +379,7 @@ int vc_parser_load_config(vc_config_s** config_info)
                } else if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_CONFIG_LANGUAGE)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_config_tag(), "language : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_config_tag(), "language : %s", (char *)key); */
                                if (NULL != temp->language)     free(temp->language);
                                temp->language = strdup((char*)key);
                                xmlFree(key);
@@ -389,15 +389,13 @@ int vc_parser_load_config(vc_config_s** config_info)
                } else if (0 == xmlStrcmp(cur->name, (const xmlChar*)VC_TAG_CONFIG_ENABLED)) {
                        key = xmlNodeGetContent(cur);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_config_tag(), "Enabled service : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_config_tag(), "Enabled service : %s", (char *)key); */
 
                                if (0 == xmlStrcmp(key, (const xmlChar *)"on")) {
                                        temp->enabled = true;
-                               }
-                               else if (0 == xmlStrcmp(key, (const xmlChar *)"off")) {
+                               } else if (0 == xmlStrcmp(key, (const xmlChar *)"off")) {
                                        temp->enabled = false;
-                               }
-                               else {
+                               } else {
                                        SLOG(LOG_ERROR, vc_config_tag(), "Enabled service is wrong");
                                        temp->enabled = false;
                                }
@@ -547,7 +545,7 @@ int vc_parser_set_language(const char* language)
        while (cur != NULL) {
                if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_CONFIG_LANGUAGE)) {
                        xmlNodeSetContent(cur, (const xmlChar *)language);
-               } 
+               }
 
                cur = cur->next;
        }
@@ -650,7 +648,7 @@ int vc_parser_find_config_changed(int* auto_lang, char** language, int* enabled)
        *language = NULL;
        while (cur_new != NULL && cur_old != NULL) {
 
-               // SLOG(LOG_DEBUG, vc_config_tag(), "cur_new->name(%s), cur_old->name(%s)", (char*)cur_new->name, (char*)cur_old->name);
+               /* SLOG(LOG_DEBUG, vc_config_tag(), "cur_new->name(%s), cur_old->name(%s)", (char*)cur_new->name, (char*)cur_old->name); */
 
                if (0 == xmlStrcmp(cur_new->name, (const xmlChar*)VC_TAG_CONFIG_AUTO_LANGUAGE)) {
                        if (0 == xmlStrcmp(cur_old->name, (const xmlChar*)VC_TAG_CONFIG_AUTO_LANGUAGE)) {
@@ -719,7 +717,7 @@ int vc_parser_find_config_changed(int* auto_lang, char** language, int* enabled)
                cur_new = cur_new->next;
                cur_old = cur_old->next;
        }
-       
+
        xmlFreeDoc(g_config_doc);
        g_config_doc = doc;
 
@@ -975,7 +973,7 @@ int vc_parser_set_foreground(int pid, bool value)
        }
 
        while (cur != NULL) {
-               if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_INFO_FOREGROUND)) {                       
+               if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_INFO_FOREGROUND)) {
                        char temp[16];
                        memset(temp, 0, 16);
                        if (true == value) {
@@ -986,7 +984,7 @@ int vc_parser_set_foreground(int pid, bool value)
 
                        xmlNodeSetContent(cur, (const xmlChar *)temp);
                        break;
-               } 
+               }
 
                cur = cur->next;
        }
@@ -1021,7 +1019,7 @@ int vc_parser_get_foreground(int* pid)
                doc->charset = 1;
 
                root_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_INFO_BASE_TAG);
-               xmlDocSetRootElement(doc,root_node);
+               xmlDocSetRootElement(doc, root_node);
 
                /* Make new command node */
                info_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_INFO_FOREGROUND);
index 8760d06..2212d02 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_CONFIG_PARSER_H_
 #define __VC_CONFIG_PARSER_H_
 
@@ -30,14 +30,14 @@ typedef struct {
        char*   uuid;
        GSList* languages;
        bool    non_fixed_support;
-}vc_engine_info_s;
+} vc_engine_info_s;
 
 typedef struct {
        char*   engine_id;
        bool    auto_lang;
        char*   language;
        bool    enabled;
-}vc_config_s;
+} vc_config_s;
 
 
 /* Get engine information */
index a9ee25e..64ea62a 100644 (file)
@@ -24,6 +24,7 @@
 extern "C" {
 #endif
 
+
 /******************************************************************************************
 * Definition for Dbus
 *******************************************************************************************/
@@ -46,7 +47,7 @@ extern "C" {
 
 
 /******************************************************************************************
-* Message Definition for all 
+* Message Definition for all
 *******************************************************************************************/
 
 #define VC_METHOD_HELLO                        "vc_method_hello"
@@ -145,7 +146,8 @@ extern "C" {
 
 #define VC_BASE_LANGUAGE               "en_US"
 
-#define VC_RETRY_COUNT         5
+#define VC_RETRY_COUNT                 5
+
 
 #define VC_CONFIG_ROOT                 tzplatform_mkpath(TZ_USER_HOME, ".voice")
 
index e8093ae..a187a86 100644 (file)
@@ -133,8 +133,8 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
        doc->encoding = (const xmlChar*)"utf-8";
        doc->charset = 1;
 
-       root_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_BASE_TAG);
-       xmlDocSetRootElement(doc,root_node);
+       root_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_BASE_TAG);
+       xmlDocSetRootElement(doc, root_node);
 
        GSList *iter = NULL;
        vc_cmd_s *temp_cmd;
@@ -144,10 +144,10 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
        iter = g_slist_nth(cmd_list, 0);
 
        SLOG(LOG_DEBUG, vc_info_tag(), "list count : %d", count);
-       char temp[16];
+       char temp[16] = {0, };
        int selected_count = 0;
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                temp_cmd = iter->data;
 
                if (NULL == temp_cmd) {
@@ -156,33 +156,33 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
                }
 
                if (type == temp_cmd->type) {
-                       SLOG(LOG_DEBUG, vc_info_tag(), "[%dth] type(%d) format(%d) domain(%d) cmd(%s) param(%s)", 
-                               i, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
+                       SLOG(LOG_DEBUG, vc_info_tag(), "[%dth] type(%d) format(%d) domain(%d) cmd(%s) param(%s)",
+                                i, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
 
                        /* Make new command node */
-                       cmd_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_COMMAND);
+                       cmd_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_COMMAND);
 
                        /* ID */
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", i);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_ID);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_ID);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(cmd_node, tmp_node);
 
                        /* PID */
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", getpid());
-                       
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_PID);
+
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_PID);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(cmd_node, tmp_node);
-                       
+
                        /* TYPE */
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", temp_cmd->type);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_TYPE);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_TYPE);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(cmd_node, tmp_node);
 
@@ -190,7 +190,7 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", temp_cmd->format);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_FORMAT);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_FORMAT);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(cmd_node, tmp_node);
 
@@ -198,17 +198,17 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", temp_cmd->domain);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_DOMAIN);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_DOMAIN);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(cmd_node, tmp_node);
 
                        /* COMMAND */
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_COMMAND_TEXT);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_COMMAND_TEXT);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp_cmd->command);
                        xmlAddChild(cmd_node, tmp_node);
 
                        /* PARAMETER */
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_PARAMETER_TEXT);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_PARAMETER_TEXT);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp_cmd->parameter);
                        xmlAddChild(cmd_node, tmp_node);
 
@@ -237,7 +237,7 @@ int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list)
                free(filepath);
        } else {
                free(filepath);
-               
+
                SLOG(LOG_DEBUG, vc_info_tag(), "No command");
                return -1;
        }
@@ -313,7 +313,7 @@ int vc_cmd_parser_get_commands(int pid, vc_cmd_type_e type, GSList** cmd_list)
 
                vc_cmd_s* temp_cmd;
                temp_cmd = (vc_cmd_s*)calloc(1, sizeof(vc_cmd_s));
-               
+
                if (NULL == temp_cmd) {
                        SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] Memory alloc error!!");
                        return -1;
@@ -335,7 +335,7 @@ int vc_cmd_parser_get_commands(int pid, vc_cmd_type_e type, GSList** cmd_list)
 
                command_node = command_node->next;
                command_node = command_node->next;
-               
+
                /* PID */
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_PID)) {
                        key = xmlNodeGetContent(command_node);
@@ -400,7 +400,7 @@ int vc_cmd_parser_get_commands(int pid, vc_cmd_type_e type, GSList** cmd_list)
                                break;
                        }
                }
-               
+
                command_node = command_node->next;
                command_node = command_node->next;
 
@@ -455,7 +455,7 @@ int vc_cmd_parser_get_commands(int pid, vc_cmd_type_e type, GSList** cmd_list)
        xmlFreeDoc(doc);
 
        *cmd_list = temp_cmd_list;
-       
+
        __vc_cmd_parser_print_commands(temp_cmd_list);
 
        return 0;
@@ -522,7 +522,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_ID)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "ID : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "ID : %s", (char *)key); */
                                vc_cmd_set_id(temp_command, atoi((char*)key));
                                xmlFree(key);
                        } else {
@@ -539,7 +539,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_PID)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "PID : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "PID : %s", (char *)key); */
                                vc_cmd_set_pid(temp_command, atoi((char*)key));
                                xmlFree(key);
                        } else {
@@ -556,7 +556,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_TYPE)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "Type : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "Type : %s", (char *)key); */
                                vc_cmd_set_type(temp_command, atoi((char*)key));
                                xmlFree(key);
                        } else {
@@ -573,7 +573,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_FORMAT)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "Format : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "Format : %s", (char *)key); */
                                vc_cmd_set_format(temp_command, atoi((char*)key));
                                xmlFree(key);
                        } else {
@@ -590,7 +590,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_DOMAIN)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "Domain : %s", (char *)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "Domain : %s", (char *)key); */
                                vc_cmd_set_domain(temp_command, atoi((char*)key));
                                xmlFree(key);
                        } else {
@@ -599,7 +599,7 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                                break;
                        }
                }
-               
+
                command_node = command_node->next;
                command_node = command_node->next;
 
@@ -607,9 +607,9 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_COMMAND_TEXT)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "Command : %s, size : %d", (char *)key, strlen(key));
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "Command : %s, size : %d", (char *)key, strlen(key)); */
                                vc_cmd_set_command(temp_command, (char*)key);
-                       
+
                                xmlFree(key);
                        } else {
                                SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] <%s> has no content", VC_TAG_CMD_COMMAND_TEXT);
@@ -625,8 +625,8 @@ int vc_cmd_parser_append_commands(int pid, vc_cmd_type_e type, vc_cmd_list_h vc_
                if (0 == xmlStrcmp(command_node->name, (const xmlChar *)VC_TAG_CMD_PARAMETER_TEXT)) {
                        key = xmlNodeGetContent(command_node);
                        if (NULL != key) {
-                               //SLOG(LOG_DEBUG, vc_info_tag(), "Parameter : %s , size : %d", (char *)key, strlen(key));
-                               //vc_cmd_set_parameter(temp_command, (char*)key);
+                               /*SLOG(LOG_DEBUG, vc_info_tag(), "Parameter : %s , size : %d", (char *)key, strlen(key)); */
+                               /*vc_cmd_set_parameter(temp_command, (char*)key); */
                                vc_cmd_set_unfixed_command(temp_command, (char*)key);
                                xmlFree(key);
                        } else {
@@ -694,7 +694,7 @@ int vc_info_parser_get_demandable_clients(GSList** client_list)
 
                                vc_demandable_client_s* temp_client;
                                temp_client = (vc_demandable_client_s*)calloc(1, sizeof(vc_demandable_client_s));
-                               
+
                                if (NULL == temp_client) {
                                        SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] Memory alloc error!!");
                                        return -1;
@@ -718,7 +718,7 @@ int vc_info_parser_get_demandable_clients(GSList** client_list)
 
        xmlFreeDoc(doc);
 
-       *client_list = temp_client_list;                
+       *client_list = temp_client_list;
 
        remove(VC_RUNTIME_INFO_DEMANDABLE_LIST);
 
@@ -793,7 +793,7 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
        } else {
                snprintf(filepath, 256, "%s", VC_RUNTIME_INFO_EX_RESULT);
        }
-       
+
        SLOG(LOG_DEBUG, vc_info_tag(), "Result file path : %s", filepath);
 
        /* Check file */
@@ -810,23 +810,23 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
        doc->encoding = (const xmlChar*)"utf-8";
        doc->charset = 1;
 
-       root_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_RESULT_BASE_TAG);
-       xmlDocSetRootElement(doc,root_node);
+       root_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_RESULT_BASE_TAG);
+       xmlDocSetRootElement(doc, root_node);
 
-       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_RESULT_TEXT);
+       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_RESULT_TEXT);
        xmlNodeSetContent(tmp_node, (const xmlChar *)result_text);
        xmlAddChild(root_node, tmp_node);
 
        memset(temp, 0, 16);
        snprintf(temp, 16, "%d", event);
 
-       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_RESULT_EVENT);
+       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_RESULT_EVENT);
        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
        xmlAddChild(root_node, tmp_node);
 
-       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_RESULT_MESSAGE);
+       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_RESULT_MESSAGE);
        xmlNodeSetContent(tmp_node, (const xmlChar *)msg);
-       xmlAddChild(root_node, tmp_node);       
+       xmlAddChild(root_node, tmp_node);
 
        /* Make client list node */
        vc_cmd_h vc_command = NULL;
@@ -848,16 +848,16 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
 
                /* Make new command node */
                cmd_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_COMMAND);
-               
-               SLOG(LOG_DEBUG, vc_info_tag(), "[Result info] ID(%d) PID(%d) type(%d) format(%d) domain(%d) cmd(%s) param(%s)", 
-                       temp_cmd->id, temp_cmd->pid, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
+
+               SLOG(LOG_DEBUG, vc_info_tag(), "[Result info] ID(%d) PID(%d) type(%d) format(%d) domain(%d) cmd(%s) param(%s)",
+                        temp_cmd->id, temp_cmd->pid, temp_cmd->type, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
 
 
                /* ID */
                memset(temp, 0, 16);
                snprintf(temp, 16, "%d", temp_cmd->id);
 
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_ID);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_ID);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                xmlAddChild(cmd_node, tmp_node);
 
@@ -865,7 +865,7 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
                memset(temp, 0, 16);
                snprintf(temp, 16, "%d", temp_cmd->pid);
 
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_PID);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_PID);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                xmlAddChild(cmd_node, tmp_node);
 
@@ -873,7 +873,7 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
                memset(temp, 0, 16);
                snprintf(temp, 16, "%d", temp_cmd->type);
 
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_TYPE);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_TYPE);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                xmlAddChild(cmd_node, tmp_node);
 
@@ -881,7 +881,7 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
                memset(temp, 0, 16);
                snprintf(temp, 16, "%d", temp_cmd->format);
 
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_FORMAT);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_FORMAT);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                xmlAddChild(cmd_node, tmp_node);
 
@@ -889,17 +889,17 @@ int vc_info_parser_set_result(const char* result_text, int event, const char* ms
                memset(temp, 0, 16);
                snprintf(temp, 16, "%d", temp_cmd->domain);
 
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_DOMAIN);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_DOMAIN);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                xmlAddChild(cmd_node, tmp_node);
 
                /* COMMAND */
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_COMMAND_TEXT);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_COMMAND_TEXT);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp_cmd->command);
                xmlAddChild(cmd_node, tmp_node);
 
                /* PARAMETER */
-               tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CMD_PARAMETER_TEXT);
+               tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CMD_PARAMETER_TEXT);
                xmlNodeSetContent(tmp_node, (const xmlChar *)temp_cmd->parameter);
                xmlAddChild(cmd_node, tmp_node);
 
@@ -933,7 +933,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
        } else {
                snprintf(filepath, 256, "%s", VC_RUNTIME_INFO_EX_RESULT);
        }
-       
+
        SLOG(LOG_DEBUG, vc_info_tag(), "Result file path : %s", filepath);
 
        xmlDocPtr doc = NULL;
@@ -972,7 +972,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
                xmlFreeDoc(doc);
                return -1;
        }
-       
+
        /* Result text */
        if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_RESULT_TEXT)) {
                key = xmlNodeGetContent(cur);
@@ -1014,7 +1014,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
                xmlFreeDoc(doc);
                return -1;
        }
-       
+
        /* Result Message */
        if (result_message != NULL) {
                if (0 == xmlStrcmp(cur->name, (const xmlChar *)VC_TAG_RESULT_MESSAGE)) {
@@ -1040,7 +1040,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
                } else if (0 == xmlStrcmp(cur->name, (const xmlChar *)"text")) {
                        continue;
                }
-               
+
                SLOG(LOG_ERROR, vc_info_tag(), "111 : %s", cur->name);
 
                /* Check Command tag */
@@ -1055,7 +1055,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
 
                vc_cmd_s* temp_cmd = NULL;
                temp_cmd = (vc_cmd_s*)vc_command;
-               
+
                if (NULL == temp_cmd) {
                        SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] Memory alloc error!!");
                        return -1;
@@ -1149,7 +1149,7 @@ int vc_info_parser_get_result(char** result_text, int* event, char** result_mess
                                return -1;
                        }
                }
-               
+
                command_node = command_node->next;
                command_node = command_node->next;
 
@@ -1269,8 +1269,7 @@ int vc_info_parser_get_result_pid_list(GSList** pid_list)
                cur = cur->next;
                if (NULL == cur) {
                        break;
-               }
-               else if (0 == xmlStrcmp(cur->name, (const xmlChar *)"text")) {
+               } else if (0 == xmlStrcmp(cur->name, (const xmlChar *)"text")) {
                        continue;
                }
 
@@ -1306,8 +1305,7 @@ int vc_info_parser_get_result_pid_list(GSList** pid_list)
                                SLOG(LOG_DEBUG, vc_info_tag(), "PID : %s", (char *)key);
                                temp_cmd->pid = atoi((char*)key);
                                xmlFree(key);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] <%s> has no content", VC_TAG_CMD_PID);
                                free(temp_cmd);
                                break;
@@ -1324,8 +1322,7 @@ int vc_info_parser_get_result_pid_list(GSList** pid_list)
                                SLOG(LOG_DEBUG, vc_info_tag(), "Type : %s", (char *)key);
                                temp_cmd->type = atoi((char*)key);
                                xmlFree(key);
-                       }
-                       else {
+                       } else {
                                SECURE_SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] <%s> has no content", VC_TAG_CMD_TYPE);
                                free(temp_cmd);
                                return -1;
@@ -1381,7 +1378,7 @@ int vc_info_parser_set_client_info(GSList* client_info_list)
        doc->encoding = (const xmlChar*)"utf-8";
        doc->charset = 1;
 
-       root_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_BASE_TAG);
+       root_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_BASE_TAG);
        xmlDocSetRootElement(doc, root_node);
 
        GSList *iter = NULL;
@@ -1394,51 +1391,51 @@ int vc_info_parser_set_client_info(GSList* client_info_list)
        SLOG(LOG_DEBUG, vc_info_tag(), "client count : %d", count);
        char temp[16] = {0, };
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                client = iter->data;
 
                if (NULL != client) {
-                       SLOG(LOG_DEBUG, vc_info_tag(), "[%dth] pid(%d) fgcmd(%d) bgcmd(%d) excmd(%d)", 
-                               i, client->pid, client->fg_cmd, client->bg_cmd, client->exclusive_cmd);
+                       SLOG(LOG_DEBUG, vc_info_tag(), "[%dth] pid(%d) fgcmd(%d) bgcmd(%d) excmd(%d)",
+                                i, client->pid, client->fg_cmd, client->bg_cmd, client->exclusive_cmd);
 
                        /* Make new client node */
-                       client_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_CLIENT);
+                       client_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_CLIENT);
 
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", client->pid);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_PID);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_PID);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(client_node, tmp_node);
 
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", client->fg_cmd);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_FGCMD);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_FGCMD);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(client_node, tmp_node);
 
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", client->bg_cmd);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_BGCMD);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_BGCMD);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(client_node, tmp_node);
 
                        memset(temp, 0, 16);
                        snprintf(temp, 16, "%d", client->exclusive_cmd);
 
-                       tmp_node = xmlNewNode(NULL,(const xmlChar*)VC_TAG_CLIENT_EXCMD);
+                       tmp_node = xmlNewNode(NULL, (const xmlChar*)VC_TAG_CLIENT_EXCMD);
                        xmlNodeSetContent(tmp_node, (const xmlChar *)temp);
                        xmlAddChild(client_node, tmp_node);
 
                        xmlAddChild(root_node, client_node);
-               } 
+               }
                iter = g_slist_next(iter);
        }
 
        int ret = xmlSaveFormatFile(VC_RUNTIME_INFO_CLIENT, doc, 1);
-       //xmlFreeDoc(doc);
+       /*xmlFreeDoc(doc); */
        if (0 >= ret) {
                SLOG(LOG_DEBUG, vc_info_tag(), "[ERROR] Fail to save client file : %d", ret);
                return -1;
@@ -1498,7 +1495,7 @@ int vc_info_parser_get_client_info(GSList** client_info_list)
 
                vc_client_info_s *client = NULL;
                client = (vc_client_info_s*)calloc(1, sizeof(vc_client_info_s));
-               
+
                if (NULL == client) {
                        SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] Memory alloc error!!");
                        return -1;
@@ -1551,7 +1548,7 @@ int vc_info_parser_get_client_info(GSList** client_info_list)
                                break;
                        }
                }
-               
+
                client_node = client_node->next;
                client_node = client_node->next;
 
@@ -1588,7 +1585,7 @@ int __vc_cmd_parser_print_commands(GSList* cmd_list)
 
        iter = g_slist_nth(cmd_list, 0);
 
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                temp_cmd = iter->data;
 
                if (NULL == temp_cmd) {
@@ -1598,8 +1595,8 @@ int __vc_cmd_parser_print_commands(GSList* cmd_list)
                }
 
                SLOG(LOG_DEBUG, vc_info_tag(), "  [%d][%p] PID(%d) ID(%d) Type(%d) Format(%d) Domain(%d)  Command(%s) Param(%s)",
-                               i, temp_cmd, temp_cmd->pid, temp_cmd->index, temp_cmd->type, temp_cmd->format, temp_cmd->domain,
-                               temp_cmd->command, temp_cmd->parameter);
+                        i, temp_cmd, temp_cmd->pid, temp_cmd->index, temp_cmd->type, temp_cmd->format, temp_cmd->domain,
+                        temp_cmd->command, temp_cmd->parameter);
 
                iter = g_slist_next(iter);
 
index 14a7ed8..fbf90cc 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_CMD_PARSER_H_
 #define __VC_CMD_PARSER_H_
 
@@ -28,16 +28,16 @@ extern "C" {
 #endif
 
 
-typedef struct _demandable_client_s{
+typedef struct _demandable_client_s {
        char*   appid;
-}vc_demandable_client_s;
+} vc_demandable_client_s;
 
-typedef struct _client_s{
+typedef struct _client_s {
        int     pid;
        bool    fg_cmd;
        bool    bg_cmd;
        bool    exclusive_cmd;
-}vc_client_info_s;
+} vc_client_info_s;
 
 
 int vc_cmd_parser_save_file(int pid, vc_cmd_type_e type, GSList* cmd_list);
index 1c42b71..f203bfe 100644 (file)
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
+
 #ifndef __VC_MAIN_H_
 #define __VC_MAIN_H_
 
@@ -43,7 +43,7 @@ extern "C" {
 #define TAG_VCCONFIG   "vcinfo"        /* config lib log tag */
 #define TAG_VCCMD      "vccmd"         /* Command log tag */
 
-/** 
+/**
 * @brief A structure of handle for identification
 */
 struct vc_s {
index 85985e7..b751639 100644 (file)
@@ -27,7 +27,7 @@
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -78,7 +78,7 @@ extern "C"
 *
 * @see vc_deinitialize()
 */
-int vc_initialize();
+int vc_initialize(void);
 
 /**
 * @brief Deinitializes voice control.
@@ -95,7 +95,7 @@ int vc_initialize();
 *
 * @see vc_deinitialize()
 */
-int vc_deinitialize();
+int vc_deinitialize(void);
 
 /**
 * @brief Connects the voice control service.
@@ -115,7 +115,7 @@ int vc_deinitialize();
 *
 * @see vc_unprepare()
 */
-int vc_prepare();
+int vc_prepare(void);
 
 /**
 * @brief Disconnects the voice control service.
@@ -134,7 +134,7 @@ int vc_prepare();
 *
 * @see vc_prepare()
 */
-int vc_unprepare();
+int vc_unprepare(void);
 
 /**
 * @brief Retrieves all supported languages using callback function.
@@ -202,7 +202,7 @@ int vc_get_current_language(char** language);
 * @retval #VC_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ERROR_NOT_SUPPORTED Not supported
 *
-* @see vc_state_changed_cb() 
+* @see vc_state_changed_cb()
 * @see vc_set_state_changed_cb()
 */
 int vc_get_state(vc_state_e* state);
@@ -226,7 +226,7 @@ int vc_get_state(vc_state_e* state);
 * @see vc_request_start()
 * @see vc_request_stop()
 * @see vc_request_cancel()
-* @see vc_set_service_state_changed_cb() 
+* @see vc_set_service_state_changed_cb()
 * @see vc_unset_service_state_changed_cb()
 */
 int vc_get_service_state(vc_service_state_e* state);
@@ -252,7 +252,7 @@ int vc_get_service_state(vc_service_state_e* state);
 *
 * @pre The state should be #VC_STATE_READY.
 *
-* @see vc_unset_command_list() 
+* @see vc_unset_command_list()
 */
 int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type);
 
@@ -273,7 +273,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type);
 *
 * @pre The state should be #VC_STATE_READY.
 *
-* @see vc_set_command_list() 
+* @see vc_set_command_list()
 */
 int vc_unset_command_list(int type);
 
@@ -316,7 +316,7 @@ int vc_set_result_cb(vc_result_cb callback, void* user_data);
 *
 * @see vc_set_result_cb()
 */
-int vc_unset_result_cb();
+int vc_unset_result_cb(void);
 
 /**
 * @brief Registers a callback function to be called when state is changed.
@@ -357,7 +357,7 @@ int vc_set_service_state_changed_cb(vc_service_state_changed_cb callback, void*
 *
 * @see vc_set_service_state_changed_cb()
 */
-int vc_unset_service_state_changed_cb();
+int vc_unset_service_state_changed_cb(void);
 
 /**
 * @brief Registers a callback function to be called when state is changed.
@@ -398,7 +398,7 @@ int vc_set_state_changed_cb(vc_state_changed_cb callback, void* user_data);
 *
 * @see vc_set_state_changed_cb()
 */
-int vc_unset_state_changed_cb();
+int vc_unset_state_changed_cb(void);
 
 /**
 * @brief Registers a callback function to be called when current language is changed.
@@ -439,7 +439,7 @@ int vc_set_current_language_changed_cb(vc_current_language_changed_cb callback,
 *
 * @see vc_set_current_language_changed_cb()
 */
-int vc_unset_current_language_changed_cb();
+int vc_unset_current_language_changed_cb(void);
 
 /**
 * @brief Registers a callback function to be called when an error occurred.
@@ -480,7 +480,7 @@ int vc_set_error_cb(vc_error_cb callback, void* user_data);
 *
 * @see vc_set_error_cb()
 */
-int vc_unset_error_cb();
+int vc_unset_error_cb(void);
 
 
 #ifdef __cplusplus
index 38948c8..a704c51 100644 (file)
@@ -26,7 +26,7 @@
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -36,7 +36,7 @@ typedef enum {
        VC_AUTH_STATE_NONE      = 0,
        VC_AUTH_STATE_VALID     = 1,
        VC_AUTH_STATE_INVALID   = 2
-}vc_auth_state_e;
+} vc_auth_state_e;
 
 
 /**
index 9e065b3..afb7810 100644 (file)
@@ -30,7 +30,7 @@
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -86,7 +86,7 @@ int vc_cmd_list_create(vc_cmd_list_h* vc_cmd_list);
 * @since_tizen 2.4
 *
 * @param[in] vc_cmd_list The command list handle
-* @param[in] free_command The command free option @c true = release each commands in list, 
+* @param[in] free_command The command free option @c true = release each commands in list,
 *                      @c false = remove command from list
 *
 * @return 0 on success, otherwise a negative error value
@@ -264,7 +264,7 @@ int vc_cmd_list_get_current(vc_cmd_list_h vc_cmd_list, vc_cmd_h* vc_command);
 * @brief Creates a handle for command.
 * @since_tizen 2.4
 *
-* @remarks If the function succeeds, @a The command handle must be released 
+* @remarks If the function succeeds, @a The command handle must be released
 *      with vc_cmd_destroy() or vc_cmd_list_destroy().
 *      You should set command and type if command is valid
 *
index e2e507c..8200285 100644 (file)
@@ -23,7 +23,7 @@
 
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -37,7 +37,7 @@ typedef enum {
        VC_CMD_FORMAT_FIXED_AND_EXTRA,  /**< Fixed + extra unfixed command */
        VC_CMD_FORMAT_EXTRA_AND_FIXED,  /**< Extra unfixed + fixed command */
        VC_CMD_FORMAT_UNFIXED_ONLY      /**< Unfixed command */
-}vc_cmd_format_e;
+} vc_cmd_format_e;
 
 
 /**
@@ -45,7 +45,7 @@ typedef enum {
 * @since_tizen 2.4
 *
 * @remark If the function succeeds, @a The command must be released with free() by you if they are not NULL.
-*      If you get the result command list in result callback and the command type of commands has non-fixed format, 
+*      If you get the result command list in result callback and the command type of commands has non-fixed format,
 *      you should check non-fixed result using this function.
 *
 * @param[in] vc_command The command handle
index 861749d..5d52a04 100644 (file)
@@ -50,7 +50,7 @@ typedef enum {
        VC_ERROR_OPERATION_REJECTED     = TIZEN_ERROR_VOICE_CONTROL | 0x015,    /**< Operation rejected */
        VC_ERROR_ITERATION_END          = TIZEN_ERROR_VOICE_CONTROL | 0x016,    /**< List reached end */
        VC_ERROR_EMPTY                  = TIZEN_ERROR_VOICE_CONTROL | 0x017     /**< List empty */
-}vc_error_e;
+} vc_error_e;
 
 /**
 * @brief Enumerations of result event.
@@ -59,7 +59,7 @@ typedef enum {
 typedef enum {
        VC_RESULT_EVENT_RESULT_SUCCESS  = 0,    /**< Normal result */
        VC_RESULT_EVENT_REJECTED        = 1     /**< Rejected result */
-}vc_result_event_e;
+} vc_result_event_e;
 
 /**
 * @brief Enumerations of service state.
@@ -70,7 +70,7 @@ typedef enum {
        VC_SERVICE_STATE_READY          = 1,    /**< 'Ready' state */
        VC_SERVICE_STATE_RECORDING      = 2,    /**< 'Recording' state */
        VC_SERVICE_STATE_PROCESSING     = 3     /**< 'Processing' state */
-}vc_service_state_e;
+} vc_service_state_e;
 
 /**
 * @brief Enumerations of client state.
@@ -80,7 +80,7 @@ typedef enum {
        VC_STATE_NONE                   = 0,    /**< 'None' state */
        VC_STATE_INITIALIZED            = 1,    /**< 'Initialized' state */
        VC_STATE_READY                  = 2     /**< 'Ready' state */
-}vc_state_e;
+} vc_state_e;
 
 
 /**
@@ -88,8 +88,8 @@ typedef enum {
 * @since_tizen 2.4
 *
 * @remarks If the duplicated commands are recognized, the event(e.g. #VC_RESULT_EVENT_REJECTED) of command may be rejected \n
-*      for selecting command as priority. If you set similar or same commands or the recognized results are multi-results, 
-*      vc_cmd_list has the multi commands. 
+*      for selecting command as priority. If you set similar or same commands or the recognized results are multi-results,
+*      vc_cmd_list has the multi commands.
 *
 * @param[in] event The result event (e.g. #VC_RESULT_EVENT_RESULT_SUCCESS, #VC_RESULT_EVENT_REJECTED)
 * @param[in] vc_cmd_list The recognized command list
index 2cc3315..8a0382a 100644 (file)
@@ -25,7 +25,7 @@
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
index f151589..c4d191f 100644 (file)
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
 
-/** 
+/**
  * @brief Defines of audio-in type.
 */
 #define VC_AUDIO_TYPE_BLUETOOTH                "VC_AUDIO_ID_BLUETOOTH"         /**< Bluetooth audio type */
@@ -77,8 +77,8 @@ extern "C"
 * @see vc_mgr_set_all_result_cb()
 * @see vc_mgr_unset_all_result_cb()
 */
-typedef bool (*vc_mgr_all_result_cb)(vc_result_event_e event, vc_cmd_list_h vc_cmd_list, 
-                                 const char* result, const char* msg, void *user_data);
+typedef bool (*vc_mgr_all_result_cb)(vc_result_event_e event, vc_cmd_list_h vc_cmd_list,
+                                                                        const char* result, const char* msg, void *user_data);
 
 /**
 * @brief Called when user speaking is detected.
@@ -124,7 +124,7 @@ int vc_mgr_initialize();
 int vc_mgr_deinitialize();
 
 /**
-* @brief Connects the vc-daemon. 
+* @brief Connects the voice control service.
 *
 * @return 0 on success, otherwise a negative error value
 * @retval #VC_ERROR_NONE Successful
@@ -164,7 +164,7 @@ int vc_mgr_unprepare();
 * @retval #VC_ERROR_INVALID_STATE Invalid state
 *
 * @pre The state should NOT be #VC_SERVICE_STATE_NONE.
-* @post        This function invokes vc_supported_language_cb() repeatedly for getting languages. 
+* @post        This function invokes vc_supported_language_cb() repeatedly for getting languages.
 *
 * @see vc_supported_language_cb()
 * @see vc_mgr_get_current_language()
@@ -204,7 +204,7 @@ int vc_mgr_get_current_language(char** language);
 *
 * @pre The state should NOT be #VC_SERVICE_STATE_NONE.
 *
-* @see vc_state_changed_cb() 
+* @see vc_state_changed_cb()
 * @see vc_set_state_changed_cb()
 */
 int vc_mgr_get_state(vc_state_e* state);
@@ -223,7 +223,7 @@ int vc_mgr_get_state(vc_state_e* state);
 * @see vc_mgr_start()
 * @see vc_mgr_stop()
 * @see vc_mgr_cancel()
-* @see vc_set_service_state_changed_cb() 
+* @see vc_set_service_state_changed_cb()
 * @see vc_unset_service_state_changed_cb()
 */
 int vc_mgr_get_service_state(vc_service_state_e* state);
@@ -240,7 +240,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state);
 *
 * @pre The state should be #VC_STATE_READY.
 *
-* @see vc_mgr_get_demandable_client_rule() 
+* @see vc_mgr_get_demandable_client_rule()
 */
 int vc_mgr_set_demandable_client_rule(const char* rule);
 
@@ -254,7 +254,7 @@ int vc_mgr_set_demandable_client_rule(const char* rule);
 *
 * @pre The state should be #VC_STATE_READY.
 *
-* @see vc_mgr_set_demandable_client_rule() 
+* @see vc_mgr_set_demandable_client_rule()
 */
 int vc_mgr_unset_demandable_client_rule();
 
@@ -289,7 +289,7 @@ int vc_mgr_is_command_format_supported(vc_cmd_format_e format, bool* support);
 *
 * @pre The state should be #VC_STATE_READY.
 *
-* @see vc_mgr_unset_command_list() 
+* @see vc_mgr_unset_command_list()
 */
 int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list);
 
@@ -337,7 +337,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list);
 *
 * @pre The state should be #VC_STATE_READY and the service state should be #VC_SERVICE_STATE_READY.
 *
-* @see vc_mgr_get_audio_type() 
+* @see vc_mgr_get_audio_type()
 */
 int vc_mgr_set_audio_type(const char* audio_id);
 
@@ -422,7 +422,7 @@ int vc_mgr_cancel();
 
 /**
 * @brief Gets the microphone volume during recording.
-*      
+*
 * @param[out] volume Recording volume
 *
 * @return 0 on success, otherwise a negative error value
@@ -432,14 +432,14 @@ int vc_mgr_cancel();
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure
 *
 * @pre The service state should be #VC_SERVICE_STATE_RECORDING.
-* 
+*
 * @see vc_mgr_start()
 */
 int vc_mgr_get_recording_volume(float* volume);
 
 /**
 * @brief Select valid result from all results.
-*      
+*
 * @param[in] vc_cmd_list The valid result list
 *
 * @return 0 on success, otherwise a negative error value
@@ -449,7 +449,7 @@ int vc_mgr_get_recording_volume(float* volume);
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure
 *
 * @pre vc_mgr_all_result_cb() should be called
-* 
+*
 * @see vc_mgr_all_result_cb()
 */
 int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list);
index 256bb48..878c596 100644 (file)
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-/** 
+/**
 * @brief Enumerations of error codes.
 */
 typedef enum {
@@ -42,7 +42,7 @@ typedef enum {
        VCP_ERROR_INVALID_LANGUAGE      = -0x0100032,                   /**< Invalid language */
        VCP_ERROR_OPERATION_FAILED      = -0x0100034,                   /**< Operation failed */
        VCP_ERROR_NOT_SUPPORTED_FEATURE = -0x0100035                    /**< Not supported feature */
-}vcp_error_e;
+} vcp_error_e;
 
 /**
 * @brief Enumerations of audio type.
@@ -50,7 +50,7 @@ typedef enum {
 typedef enum {
        VCP_AUDIO_TYPE_PCM_S16_LE = 0,  /**< Signed 16bit audio type, Little endian */
        VCP_AUDIO_TYPE_PCM_U8           /**< Unsigned 8bit audio type */
-}vcp_audio_type_e;
+} vcp_audio_type_e;
 
 /**
 * @brief Enumerations of callback event.
@@ -59,7 +59,7 @@ typedef enum {
        VCP_RESULT_EVENT_SUCCESS = 0,           /**< Event when the recognition full result is ready  */
        VCP_RESULT_EVENT_REJECTED,              /**< Event when the recognition result is rejected */
        VCP_RESULT_EVENT_ERROR                  /**< Event when the recognition has failed */
-}vcp_result_event_e;
+} vcp_result_event_e;
 
 /**
 * @brief Enumerations of command type.
@@ -68,7 +68,7 @@ typedef enum {
        VCP_COMMAND_TYPE_FIXED = 0,             /**< Fixed command */
        VCP_COMMAND_TYPE_FIXED_AND_NON_FIXED,   /**< Fixed command + Non-fixed command */
        VCP_COMMAND_TYPE_NON_FIXED_AND_FIXED    /**< Non-fixed command + Fixed command */
-}vcp_command_type_e;
+} vcp_command_type_e;
 
 /**
 * @brief Enumerations of speech detect.
@@ -77,14 +77,14 @@ typedef enum {
        VCP_SPEECH_DETECT_NONE = 0,     /**< No event */
        VCP_SPEECH_DETECT_BEGIN,        /**< Begin of speech detected */
        VCP_SPEECH_DETECT_END,          /**< End of speech detected */
-}vcp_speech_detect_e;
+} vcp_speech_detect_e;
 
-/** 
+/**
 * @brief A structure of handle for VC command
 */
 typedef int vcp_cmd_h;
 
-/** 
+/**
  * @brief Defines of bluetooth audio id.
 */
 #define VCP_AUDIO_ID_BLUETOOTH         "VC_AUDIO_ID_BLUETOOTH"         /**< Bluetooth audio id */
@@ -100,9 +100,9 @@ typedef int vcp_cmd_h;
 #define VC_RESULT_MESSAGE_ERROR_TOO_LOUD       "vc.result.message.error.too.loud"
 
 
-/** 
+/**
 * @brief Called when the daemon gets synthesized result.
-* 
+*
 * @param[in] event A result event
 * @param[in] result_id Result ids
 * @param[in] count Result count
@@ -115,11 +115,11 @@ typedef int vcp_cmd_h;
 *
 * @see vcpe_stop()
 */
-typedef void (*vcpe_result_cb)(vcp_result_event_e event, int* result_id, int count, 
-                              const char* all_result, const char* non_fixed_result, const char* msg, void *user_data);
+typedef void (*vcpe_result_cb)(vcp_result_event_e event, int* result_id, int count, const char* all_result,
+                                                          const char* non_fixed_result, const char* msg, void *user_data);
 
 /**
-* @brief Called to retrieve the supported languages. 
+* @brief Called to retrieve the supported languages.
 *
 * @param[in] language A language is specified as an ISO 3166 alpha-2 two letter country-code
 *              followed by ISO 639-1 for the two-letter language code \n
@@ -128,7 +128,7 @@ typedef void (*vcpe_result_cb)(vcp_result_event_e event, int* result_id, int cou
 *
 * @return @c true to continue with the next iteration of the loop \n @c false to break out of the loop
 *
-* @pre vcpe_foreach_supported_languages() will invoke this callback. 
+* @pre vcpe_foreach_supported_languages() will invoke this callback.
 *
 * @see vcpe_foreach_supported_languages()
 */
@@ -145,7 +145,7 @@ typedef bool (*vcpe_supported_language_cb)(const char* language, void* user_data
 * @retval #VCP_ERROR_INVALID_PARAMETER Invalid parameter
 * @retval #VCP_ERROR_INVALID_STATE Already initialized
 * @retval #VCP_ERROR_OPERATION_FAILED Operation failed
-* 
+*
 * @see vcpe_deinitialize()
 */
 typedef int (* vcpe_initialize)(void);
@@ -156,7 +156,7 @@ typedef int (* vcpe_initialize)(void);
 * @return 0 on success, otherwise a negative error value
 * @retval #VCP_ERROR_NONE Successful
 * @retval #VCP_ERROR_INVALID_STATE Not initialized
-* 
+*
 * @see vcpe_initialize()
 */
 typedef void (* vcpe_deinitialize)(void);
@@ -200,7 +200,7 @@ typedef int (* vcpe_get_recording_format)(const char* audio_id, vcp_audio_type_e
 * @retval #VCP_ERROR_INVALID_PARAMETER Invalid parameter
 * @retval #VCP_ERROR_INVALID_STATE Not initialized
 *
-* @post        This function invokes vcpe_supported_language_cb() repeatedly for getting supported languages. 
+* @post        This function invokes vcpe_supported_language_cb() repeatedly for getting supported languages.
 *
 * @see vcpe_supported_language_cb()
 */
@@ -216,7 +216,7 @@ typedef int (* vcpe_foreach_supported_languages)(vcpe_supported_language_cb call
 typedef bool (* vcpe_is_language_supported)(const char* language);
 
 /**
-* @brief Sets language. 
+* @brief Sets language.
 *
 * @param[in] language language.
 *
@@ -232,7 +232,7 @@ typedef int (*vcpe_set_language)(const char* language);
 *
 * @remark This function should set commands via vcpd_foreach_command().
 *
-* @param[in] vcp_command command handle. 
+* @param[in] vcp_command command handle.
 *
 * @return 0 on success, otherwise a negative error value
 * @retval #VCP_ERROR_NONE Successful
@@ -282,10 +282,10 @@ typedef int (* vcpe_unset_commands)();
 typedef int (* vcpe_start)(bool stop_by_silence);
 
 /**
-* @brief Sets recording data for speech recognition from recorder. 
+* @brief Sets recording data for speech recognition from recorder.
+*
+* @remark This function should be returned immediately after recording data copy.
 *
-* @remark This function should be returned immediately after recording data copy. 
-* 
 * @param[in] data A recording data
 * @param[in] length A length of recording data
 * @param[out] silence_detected @c true Silence detected \n @c false No silence detected
@@ -342,7 +342,7 @@ typedef int (* vcpe_cancel)(void);
 */
 
 /**
-* @brief Called to retrieve the commands. 
+* @brief Called to retrieve the commands.
 *
 * @param[in] id command id
 * @param[in] type command type
@@ -352,7 +352,7 @@ typedef int (* vcpe_cancel)(void);
 * @param[in] user_data The user data passed from the foreach function
 *
 * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop.
-* @pre vcpd_foreach_command() will invoke this callback. 
+* @pre vcpd_foreach_command() will invoke this callback.
 *
 * @see vcpd_foreach_command()
 */
@@ -371,7 +371,7 @@ typedef bool (* vcpd_foreach_command_cb)(int id, int type, const char* command,
 * @retval #VCP_ERROR_OPERATION_FAILED Operation failure
 * @retval #VCP_ERROR_INVALID_STATE Invalid state
 *
-* @post        This function invokes vcpd_foreach_command_cb() repeatedly for getting commands. 
+* @post        This function invokes vcpd_foreach_command_cb() repeatedly for getting commands.
 *
 * @see vcpd_foreach_command_cb()
 * @see vcpe_set_commands()
@@ -443,7 +443,7 @@ typedef struct {
 } vcpd_funcs_s;
 
 /**
-* @brief Loads the engine. 
+* @brief Loads the engine.
 *
 * @param[in] pdfuncs The daemon functions
 * @param[out] pefuncs The engine functions
@@ -462,7 +462,7 @@ typedef struct {
 int vcp_load_engine(vcpd_funcs_s* pdfuncs, vcpe_funcs_s* pefuncs);
 
 /**
-* @brief Unloads this engine by the daemon. 
+* @brief Unloads this engine by the daemon.
 *
 * @pre The vcp_load_engine() should be successful.
 *
@@ -479,15 +479,15 @@ void vcp_unload_engine(void);
 * @param[in] use_network @c true to need network @c false not to need network.
 * @param[in] user_data The User data passed from vcp_get_engine_info()
 *
-* @pre vcp_get_engine_info() will invoke this callback. 
+* @pre vcp_get_engine_info() will invoke this callback.
 *
 * @see vcp_get_engine_info()
 */
-typedef void (*vcpe_engine_info_cb)(const char* engine_uuid, const char* engine_name, const char* engine_setting, 
-                                   bool use_network, void* user_data);
+typedef void (*vcpe_engine_info_cb)(const char* engine_uuid, const char* engine_name, const char* engine_setting,
+                                                                       bool use_network, void* user_data);
 
 /**
-* @brief Gets the engine base information before the engine is loaded by the daemon. 
+* @brief Gets the engine base information before the engine is loaded by the daemon.
 *
 * @param[in] callback Callback function
 * @param[in] user_data User data to be passed to the callback function
index 28ed805..bd7127e 100644 (file)
@@ -64,13 +64,13 @@ typedef bool(*vc_setting_supported_language_cb)(const char* language, void* user
 
 
 /**
-* @brief Initialize voice control setting 
+* @brief Initialize voice control setting
 *
 * @remarks If the function succeeds, @a vc mgr must be released with vc_setting_finalize().
 *
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
-* @retval #VC_ERROR_INVALID_STATE VC setting has Already been initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC setting has Already been initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_finalize()
@@ -82,7 +82,7 @@ int vc_setting_initialize(void);
 *
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_initialize()
@@ -98,10 +98,10 @@ int vc_setting_deinitialize(void);
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
 * @retval #VC_ERROR_INVALID_PARAMETER Invalid parameter.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
-* @post        This function invokes vc_setting_supported_language_cb() repeatedly for getting supported languages. 
+* @post        This function invokes vc_setting_supported_language_cb() repeatedly for getting supported languages.
 *
 * @see vc_setting_supported_language_cb()
 */
@@ -118,7 +118,7 @@ int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb call
 * @retval #VC_ERROR_NONE Success.
 * @retval #VC_ERROR_OUT_OF_MEMORY Out of memory.
 * @retval #VC_ERROR_INVALID_PARAMETER Invalid parameter.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_set_language()
@@ -133,7 +133,7 @@ int vc_setting_get_language(char** language);
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
 * @retval #VC_ERROR_INVALID_PARAMETER Invalid parameter.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_get_language()
@@ -148,7 +148,7 @@ int vc_setting_set_language(const char* language);
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
 * @retval #VC_ERROR_INVALID_PARAMETER Invalid parameter.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_get_auto_language()
@@ -163,7 +163,7 @@ int vc_setting_set_auto_language(bool value);
 * @return 0 on success, otherwise a negative error value.
 * @retval #VC_ERROR_NONE Success.
 * @retval #VC_ERROR_INVALID_PARAMETER Invalid parameter.
-* @retval #VC_ERROR_INVALID_STATE VC Not initialized. 
+* @retval #VC_ERROR_INVALID_STATE VC Not initialized.
 * @retval #VC_ERROR_OPERATION_FAILED Operation failure.
 *
 * @see vc_setting_set_auto_language()
index fb00d77..f9ecd2c 100644 (file)
@@ -29,7 +29,7 @@
 */
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -69,7 +69,7 @@ typedef void (*vc_widget_send_current_command_list_cb)(vc_cmd_list_h* vc_cmd_lis
 
 
 /**
-* @brief Initialize voice control for widget. 
+* @brief Initialize voice control for widget.
 *
 * @param[in] vc_widget The voice control handle
 *
@@ -151,7 +151,7 @@ int vc_widget_unprepare();
 * @retval #VC_ERROR_INVALID_STATE Invalid state
 *
 * @pre The state should be #VC_STATE_READY.
-* @post        This function invokes vc_supported_language_cb() repeatedly for getting languages. 
+* @post        This function invokes vc_supported_language_cb() repeatedly for getting languages.
 *
 * @see vc_supported_language_cb()
 * @see vc_widget_get_current_language()
@@ -195,7 +195,7 @@ int vc_widget_get_current_language(char** language);
 * @see vc_widget_deinitialize()
 * @see vc_widget_prepare()
 * @see vc_widget_unprepare()
-* @see vc_widget_set_state_changed_cb() 
+* @see vc_widget_set_state_changed_cb()
 * @see vc_widget_unset_state_changed_cb()
 */
 int vc_widget_get_state(vc_state_e* state);
index f21b5c5..fc36c02 100644 (file)
@@ -100,7 +100,7 @@ int vcd_client_manager_set_demandable_client(int pid, GSList* client_list)
                GSList *iter = NULL;
                vc_demandable_client_s* temp_client;
                iter = g_slist_nth(g_demandable_client, 0);
-               
+
                while (NULL != iter) {
                        temp_client = iter->data;
 
@@ -129,7 +129,7 @@ bool vcd_client_manager_check_demandable_client(int pid)
        /* Check demandable appid */
        char appid[128] = {0, };
        aul_app_get_appid_bypid(pid, appid, sizeof(appid));
-       
+
        if (0 < strlen(appid)) {
                SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] %s(%d) requests start", appid, pid);
        } else {
@@ -140,7 +140,7 @@ bool vcd_client_manager_check_demandable_client(int pid)
        GSList *iter = NULL;
        vc_demandable_client_s* temp_client;
        iter = g_slist_nth(g_demandable_client, 0);
-       
+
        while (NULL != iter) {
                temp_client = iter->data;
 
@@ -409,7 +409,6 @@ int vcd_client_command_collect_command()
                                                g_cur_cmd_list.background_cmds = g_slist_append(g_cur_cmd_list.background_cmds, bg_cmd);
                                        }
                                }
-
                                return 0;
                        }
                } else {
@@ -514,7 +513,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da
                        id_count++;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Widget : id(%d) index(%d) format(%d) command(%s) param(%s) domain(%d)"
-                               , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
+                                , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
 
                        callback(temp_cmd->id, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain, user_data);
 
@@ -533,7 +532,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da
                        id_count++;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Foreground : id(%d) index(%d) format(%d) command(%s) param(%s) domain(%d)"
-                               , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
+                                , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
 
                        callback(temp_cmd->id, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain, user_data);
 
@@ -552,7 +551,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da
                        id_count++;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] System : id(%d) index(%d) format(%d) domain(%d) command(%s) param(%s)"
-                               , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
+                                , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->domain, temp_cmd->command, temp_cmd->parameter);
 
                        callback(temp_cmd->id, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain, user_data);
 
@@ -571,7 +570,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da
                        id_count++;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Exclusive system : id(%d) index(%d) format(%d) command(%s) param(%s) domain(%d)"
-                               , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
+                                , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
 
                        callback(temp_cmd->id, temp_cmd->type, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain, user_data);
 
@@ -600,7 +599,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da
                                id_count++;
 
                                SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Background : id(%d) index(%d) format(%d) command(%s) param(%s) domain(%d)"
-                                       , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
+                                        , temp_cmd->id, temp_cmd->index, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain);
 
                                callback(temp_cmd->id, temp_cmd->format, temp_cmd->command, temp_cmd->parameter, temp_cmd->domain, user_data);
 
@@ -644,14 +643,13 @@ static vc_cmd_s* __command_copy(vc_cmd_s* src_cmd)
        if (NULL != src_cmd->parameter) {
                temp_cmd->parameter = strdup(src_cmd->parameter);
        }
-       
+
        temp_cmd->key = src_cmd->key;
        temp_cmd->modifier = src_cmd->modifier;
 
        return temp_cmd;
 }
 
-//int vcd_client_get_cmd_info_from_result_id(int result_id, int* pid, int* cmd_type, vc_cmd_s** result)
 int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
 {
        GSList *iter = NULL;
@@ -665,9 +663,9 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
                        temp_cmd = iter->data;
 
                        if (result_id == temp_cmd->id) {
-                               //*pid = g_cur_cmd_list.foreground;
-                               //*cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_UI_CONTROL;
-                               //SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type);
+                               /**pid = g_cur_cmd_list.foreground; */
+                               /**cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_UI_CONTROL; */
+                               /*SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type); */
 
                                *result = __command_copy(temp_cmd);
 
@@ -689,9 +687,9 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
                        SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] command id (%d)", temp_cmd->id);
 
                        if (result_id == temp_cmd->id) {
-                               //*pid = g_cur_cmd_list.foreground;
-                               //*cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_FOREGROUND;
-                               //SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type);
+                               /**pid = g_cur_cmd_list.foreground; */
+                               /**cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_FOREGROUND; */
+                               /*SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type); */
 
                                *result = __command_copy(temp_cmd);
                                return 0;
@@ -709,9 +707,9 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
                        temp_cmd = iter->data;
 
                        if (result_id == temp_cmd->id) {
-                               //*pid = g_manager.pid;
-                               //*cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_SYSTEM;
-                               //SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type);
+                               /**pid = g_manager.pid; */
+                               /**cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_SYSTEM; */
+                               /*SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type); */
 
                                *result = __command_copy(temp_cmd);
                                return 0;
@@ -729,9 +727,9 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
                        temp_cmd = iter->data;
 
                        if (result_id == temp_cmd->id) {
-                               //*pid = g_manager.pid;
-                               //*cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_SYSTEM_EXCLUSIVE;
-                               //SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type);
+                               /**pid = g_manager.pid; */
+                               /**cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_SYSTEM_EXCLUSIVE; */
+                               /*SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Find result pid(%d) type(%d)", *pid, *cmd_type); */
 
                                *result = __command_copy(temp_cmd);
                                return 0;
@@ -759,8 +757,8 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result)
                                temp_cmd = back_iter->data;
 
                                if (result_id == temp_cmd->id) {
-                                       //*pid = back_cmd_info->pid;
-                                       //*cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_BACKGROUND;
+                                       /**pid = back_cmd_info->pid; */
+                                       /**cmd_type = VCD_CLIENT_COMMAND_GROUP_TYPE_BACKGROUND; */
 
                                        *result = __command_copy(temp_cmd);
                                        return 0;
@@ -804,7 +802,7 @@ int __show_client_list()
                SLOG(LOG_DEBUG, TAG_VCD, "No Client");
        } else {
                iter = g_slist_nth(g_client_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[%dth] pid(%d)", i, data->pid);
@@ -824,7 +822,7 @@ int __show_client_list()
                SLOG(LOG_DEBUG, TAG_VCD, "No widget");
        } else {
                iter = g_slist_nth(g_widget_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        widget_data = iter->data;
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[%dth] pid(%d)", i, widget_data->pid);
@@ -851,7 +849,7 @@ int __show_command_list(GSList* cmd_group)
                SLOG(LOG_DEBUG, TAG_VCD, "No command");
        } else {
                iter = g_slist_nth(cmd_group, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
                        if (NULL != data->parameter) {
@@ -878,10 +876,10 @@ GSList* __client_get_item(const int pid)
 
        if (0 < count) {
                iter = g_slist_nth(g_client_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
-                       if (pid == data->pid) 
+                       if (pid == data->pid)
                                return iter;
 
                        iter = g_slist_next(iter);
@@ -895,16 +893,16 @@ vc_client_info_s* __client_get_element(int pid)
 {
        GSList *iter = NULL;
        vc_client_info_s *data = NULL;
-       
+
        int count = g_slist_length(g_client_list);
        int i;
 
        if (0 < count) {
                iter = g_slist_nth(g_client_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
-                       if (pid == data->pid) 
+                       if (pid == data->pid)
                                return data;
 
                        iter = g_slist_next(iter);
@@ -919,7 +917,7 @@ int vcd_client_add(int pid)
        /*Check pid is duplicated*/
        GSList *tmp = NULL;
        tmp = __client_get_item(pid);
-       
+
        if (NULL != tmp) {
                SLOG(LOG_WARN, TAG_VCD, "[Client Data] Client pid is already registered");
                return VCD_ERROR_INVALID_PARAMETER;
@@ -939,7 +937,7 @@ int vcd_client_add(int pid)
 
        /* Add item to global list */
        g_client_list = g_slist_append(g_client_list, info);
-       
+
        if (NULL == g_client_list) {
                SLOG(LOG_ERROR, TAG_VCD, "[Client Data ERROR] Fail to add new client");
                return -1;
@@ -949,7 +947,7 @@ int vcd_client_add(int pid)
 
 #ifdef CLIENT_DATA_DEBUG
        __show_client_list();
-#endif 
+#endif
        return 0;
 }
 
@@ -977,7 +975,7 @@ int vcd_client_delete(int pid)
 
 #ifdef CLIENT_DATA_DEBUG
        __show_client_list();
-#endif 
+#endif
 
        return 0;
 }
@@ -998,7 +996,7 @@ bool vcd_client_is_available(int pid)
 int vcd_client_get_ref_count()
 {
        int count = 0;
-       
+
        count = g_slist_length(g_client_list) + g_slist_length(g_widget_list);
        if (0 < g_manager.pid) {
                count++;
@@ -1013,7 +1011,7 @@ int vcd_client_get_list(int** pids, int* pid_count)
 {
        if (NULL == pids || NULL == pid_count)
                return -1;
-       
+
        int count = g_slist_length(g_client_list);
 
        if (0 == count)
@@ -1025,7 +1023,7 @@ int vcd_client_get_list(int** pids, int* pid_count)
                SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to allocate memory");
                return VCD_ERROR_OUT_OF_MEMORY;
        }
-       
+
        GSList *iter = NULL;
        vc_client_info_s *data = NULL;
        int i = 0;
@@ -1152,10 +1150,10 @@ GSList* __widget_get_item(int pid)
 
        if (0 < count) {
                iter = g_slist_nth(g_widget_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
-                       if (pid == data->pid) 
+                       if (pid == data->pid)
                                return iter;
 
                        iter = g_slist_next(iter);
@@ -1169,13 +1167,13 @@ widget_info_s* __widget_get_element(int pid)
 {
        GSList *iter = NULL;
        widget_info_s *data = NULL;
-       
+
        int count = g_slist_length(g_widget_list);
        int i;
 
        if (0 < count) {
                iter = g_slist_nth(g_widget_list, 0);
-               for (i = 0;i < count;i++) {
+               for (i = 0; i < count; i++) {
                        data = iter->data;
 
                        if (NULL != data) {
@@ -1261,7 +1259,7 @@ int vcd_client_widget_add(int pid)
 
 #ifdef CLIENT_DATA_DEBUG
        __show_client_list();
-#endif 
+#endif
        return 0;
 }
 
@@ -1289,7 +1287,7 @@ int vcd_client_widget_delete(int pid)
 
 #ifdef CLIENT_DATA_DEBUG
        __show_client_list();
-#endif 
+#endif
 
        return 0;
 }
@@ -1338,7 +1336,7 @@ int vcd_client_widget_set_command(int pid)
        }
 
        info->widget_cmd = true;
-       
+
        return 0;
 }
 
@@ -1352,6 +1350,6 @@ int vcd_client_widget_unset_command(int pid)
        }
 
        info->widget_cmd = false;
-       
+
        return 0;
 }
\ No newline at end of file
index 2a826ab..fc4f4d4 100644 (file)
@@ -29,9 +29,9 @@ extern "C" {
 typedef struct {
        int     pid;
        int     cmd_count;
-       
+
        GSList* cmds;
-}background_command_s;
+} background_command_s;
 
 typedef struct {
        int total_cmd_count;
@@ -48,19 +48,19 @@ typedef struct {
        /* Other applications */
        int     bg_cmd_count;
        GSList* background_cmds;
-}current_commands_list_s;
+} current_commands_list_s;
 
 
 typedef struct {
        int     pid;
        bool    manager_cmd;
        bool    exclusive_cmd_option;
-}manager_info_s;
+} manager_info_s;
 
 typedef struct {
        int     pid;
        bool    widget_cmd;
-}widget_info_s;
+} widget_info_s;
 
 
 /*
index 522458f..2e0586f 100644 (file)
@@ -121,4 +121,4 @@ vcd_state_e vcd_config_get_service_state()
 int vcd_config_get_foreground(int* pid)
 {
        return vc_config_mgr_get_foreground(pid);
-}
\ No newline at end of file
+}
index 5afdddf..26380ad 100644 (file)
@@ -71,7 +71,7 @@ int vcdc_send_hello(int pid, vcd_client_type_e type)
                return -1;
        }
 
-       if (NULL == msg) { 
+       if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to create message");
                return VCD_ERROR_OUT_OF_MEMORY;
        }
@@ -87,7 +87,7 @@ int vcdc_send_hello(int pid, vcd_client_type_e type)
        result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err);
        dbus_message_unref(msg);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] %s", err.message);
                dbus_error_free(&err);
        }
@@ -95,7 +95,7 @@ int vcdc_send_hello(int pid, vcd_client_type_e type)
        if (NULL != result_msg) {
                dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID);
 
-               if (dbus_error_is_set(&err)) { 
+               if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Dbus] Get arguments error (%s)", err.message);
                        dbus_error_free(&err);
                        result = VCD_ERROR_OPERATION_FAILED;
@@ -113,15 +113,15 @@ int vcdc_send_hello(int pid, vcd_client_type_e type)
 int vcdc_send_show_tooltip(int pid, bool show)
 {
        if (0 > pid) {
-               SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] widget pid is NOT valid" );
+               SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] widget pid is NOT valid");
                return -1;
        }
 
-       char service_name[64];
+       char service_name[64] = {0, };
        memset(service_name, 0, 64);
        snprintf(service_name, 64, "%s", VC_WIDGET_SERVICE_NAME);
 
-       char target_if_name[128];
+       char target_if_name[128] = {0, };
        snprintf(target_if_name, sizeof(target_if_name), "%s", VC_WIDGET_SERVICE_INTERFACE);
 
        DBusMessage* msg;
@@ -129,12 +129,12 @@ int vcdc_send_show_tooltip(int pid, bool show)
        SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] send widget show tooltip signal : pid(%d) show(%d)", pid, show);
 
        msg = dbus_message_new_method_call(
-               service_name, 
-               VC_WIDGET_SERVICE_OBJECT_PATH, 
-               target_if_name, 
-               VCD_WIDGET_METHOD_SHOW_TOOLTIP);
+                         service_name,
+                         VC_WIDGET_SERVICE_OBJECT_PATH,
+                         target_if_name,
+                         VCD_WIDGET_METHOD_SHOW_TOOLTIP);
 
-       if (NULL == msg) { 
+       if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to create message");
                return VCD_ERROR_OUT_OF_MEMORY;
        }
@@ -279,21 +279,21 @@ int vcdc_send_error_signal(int pid, int reason, char *err_msg)
        SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] send error signal : reason(%d), Error Msg(%s)", reason, err_msg);
 
        msg = dbus_message_new_method_call(
-               service_name, 
-               VC_CLIENT_SERVICE_OBJECT_PATH, 
-               target_if_name, 
-               VCD_METHOD_ERROR);
+                         service_name,
+                         VC_CLIENT_SERVICE_OBJECT_PATH,
+                         VC_CLIENT_SERVICE_INTERFACE,
+                         VCD_METHOD_ERROR);
 
-       if (NULL == msg) { 
+       if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to create message");
                return VCD_ERROR_OUT_OF_MEMORY;
        }
 
-       dbus_message_append_args(msg, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INT32, &reason, 
-               DBUS_TYPE_STRING, &err_msg,
-               DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg,
+                                                        DBUS_TYPE_INT32, &pid,
+                                                        DBUS_TYPE_INT32, &reason,
+                                                        DBUS_TYPE_STRING, &err_msg,
+                                                        DBUS_TYPE_INVALID);
 
        dbus_message_set_no_reply(msg, TRUE);
 
@@ -318,7 +318,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
        msg = dbus_connection_pop_message(g_conn_listener);
 
        /* loop again if we haven't read a message */
-       if (NULL == msg) { 
+       if (NULL == msg) {
                return ECORE_CALLBACK_RENEW;
        }
 
@@ -408,7 +408,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
        else if (dbus_message_is_method_call(msg, VC_SERVER_SERVICE_INTERFACE, VC_WIDGET_METHOD_CANCEL))
                vcd_dbus_server_widget_cancel(g_conn_listener, msg);
 
-       else 
+       else
                return ECORE_CALLBACK_RENEW;
 
        /* free the message */
@@ -440,7 +440,7 @@ int vcd_dbus_open_connection()
        /* connect to the bus and check for errors */
        g_conn_listener = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail dbus_bus_get : %s", err.message);
                dbus_error_free(&err);
        }
@@ -459,7 +459,7 @@ int vcd_dbus_open_connection()
                return VCD_ERROR_OPERATION_FAILED;
        }
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message);
                dbus_error_free(&err);
                return VCD_ERROR_OPERATION_FAILED;
@@ -473,7 +473,7 @@ int vcd_dbus_open_connection()
        dbus_bus_add_match(g_conn_listener, rule, &err);/* see signals from the given interface */
        dbus_connection_flush(g_conn_listener);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] dbus_bus_add_match() : %s", err.message);
                dbus_error_free(&err);
                return VCD_ERROR_OPERATION_FAILED;
index 3b889fe..543a7d6 100644 (file)
@@ -28,7 +28,7 @@ typedef enum {
        VCD_CLIENT_TYPE_NORMAL,
        VCD_CLIENT_TYPE_WIDGET,
        VCD_CLIENT_TYPE_MANAGER
-}vcd_client_type_e;
+} vcd_client_type_e;
 
 int vcd_dbus_open_connection();
 
index 77be315..52a0d7b 100644 (file)
@@ -28,9 +28,9 @@ int __dbus_error_return(DBusConnection* conn, DBusMessage* msg, int ret)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
-                       DBUS_TYPE_INT32, &ret, 
-                       DBUS_TYPE_INVALID);
+               dbus_message_append_args(reply,
+                                                                DBUS_TYPE_INT32, &ret,
+                                                                DBUS_TYPE_INVALID);
 
                if (0 == ret) {
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)");
@@ -93,10 +93,10 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg)
        dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
                DBUS_TYPE_INVALID);
-       
+
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Initialize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr initialize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -109,8 +109,8 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
-                       DBUS_TYPE_INT32, &ret, 
+               dbus_message_append_args(reply,
+                       DBUS_TYPE_INT32, &ret,
                        DBUS_TYPE_INVALID);
 
                if (0 == ret) {
@@ -146,7 +146,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Finalize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr finalize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -156,7 +156,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg)
        }
 
        DBusMessage* reply;
-       
+
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
@@ -196,7 +196,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Set command");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set command : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -211,7 +211,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg)
        if (NULL != reply) {
                if (0 == ret) {
                        /* Append result and language */
-                       dbus_message_append_args( reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+                       dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
                } else {
@@ -248,7 +248,7 @@ int vcd_dbus_server_mgr_unset_command(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD manager unset command");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr unset command : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -300,7 +300,7 @@ int vcd_dbus_server_mgr_set_demandable_client(DBusConnection* conn, DBusMessage*
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Set demandable client");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set demandable client : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -347,17 +347,17 @@ int vcd_dbus_server_mgr_set_audio_type(DBusConnection* conn, DBusMessage* msg)
 
        int pid = 0;
        char* audio_type = NULL;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set audio type");
 
-       dbus_message_get_args(msg, &err, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_STRING, &audio_type,
-               DBUS_TYPE_INVALID);
+       dbus_message_get_args(msg, &err,
+                                                 DBUS_TYPE_INT32, &pid,
+                                                 DBUS_TYPE_STRING, &audio_type,
+                                                 DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set audio type : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -401,16 +401,16 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg)
 
        int pid = 0;
        char* audio_type = NULL;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager get audio type");
 
-       dbus_message_get_args(msg, &err, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_get_args(msg, &err,
+                                                 DBUS_TYPE_INT32, &pid,
+                                                 DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set audio type : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -423,10 +423,10 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
-                       DBUS_TYPE_INT32, &ret, 
-                       DBUS_TYPE_STRING, &audio_type, 
-                       DBUS_TYPE_INVALID);
+               dbus_message_append_args(reply,
+                                                                DBUS_TYPE_INT32, &ret,
+                                                                DBUS_TYPE_STRING, &audio_type,
+                                                                DBUS_TYPE_INVALID);
 
                if (0 == ret) {
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d), audio type(%s)", ret, audio_type);
@@ -458,16 +458,16 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg)
        dbus_error_init(&err);
 
        int pid = 0;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set client info");
 
-       dbus_message_get_args(msg, &err, 
-               DBUS_TYPE_INT32, &pid,
-               DBUS_TYPE_INVALID);
+       dbus_message_get_args(msg, &err,
+                                                 DBUS_TYPE_INT32, &pid,
+                                                 DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set client info : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -480,9 +480,9 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
-                       DBUS_TYPE_INT32, &ret, 
-                       DBUS_TYPE_INVALID);
+               dbus_message_append_args(reply,
+                                                                DBUS_TYPE_INT32, &ret,
+                                                                DBUS_TYPE_INVALID);
 
                if (0 == ret) {
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
@@ -515,19 +515,19 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg)
        int silence = 0;
        int exclusive = 0;
        int start_by_client = 0;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager start");
 
-       dbus_message_get_args(msg, &err, 
-               DBUS_TYPE_INT32, &pid, 
+       dbus_message_get_args(msg, &err,
+               DBUS_TYPE_INT32, &pid,
                DBUS_TYPE_INT32, &silence,
                DBUS_TYPE_INT32, &exclusive,
                DBUS_TYPE_INT32, &start_by_client,
                DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr start : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -723,10 +723,10 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg)
        dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
                DBUS_TYPE_INVALID);
-       
+
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Initialize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd initialize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -741,7 +741,7 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
+               dbus_message_append_args(reply,
                        DBUS_TYPE_INT32, &ret,
                        DBUS_TYPE_INT32, &mgr_pid,
                        DBUS_TYPE_INVALID);
@@ -779,7 +779,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Finalize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd finalize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -789,7 +789,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg)
        }
 
        DBusMessage* reply;
-       
+
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
@@ -831,7 +831,7 @@ int vcd_dbus_server_set_exclusive_command(DBusConnection* conn, DBusMessage* msg
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD set exclusive command");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd unset command : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -846,7 +846,7 @@ int vcd_dbus_server_set_exclusive_command(DBusConnection* conn, DBusMessage* msg
        if (NULL != reply) {
                if (0 == ret) {
                        /* Append result and language */
-                       dbus_message_append_args( reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+                       dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
                } else {
@@ -885,7 +885,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD set command");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd set command : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -900,7 +900,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg)
        if (NULL != reply) {
                if (0 == ret) {
                        /* Append result and language */
-                       dbus_message_append_args( reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+                       dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
                } else {
@@ -938,7 +938,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD unset command");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd unset command : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -953,7 +953,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg)
        if (NULL != reply) {
                if (0 == ret) {
                        /* Append result and language */
-                       dbus_message_append_args( reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+                       dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
                } else {
@@ -986,14 +986,14 @@ int vcd_dbus_server_start_request(DBusConnection* conn, DBusMessage* msg)
 
        int pid;
        int silence;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Start");
 
        dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &silence, DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd start : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1041,7 +1041,7 @@ int vcd_dbus_server_stop_request(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Stop");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd stop : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1089,7 +1089,7 @@ int vcd_dbus_server_cancel_request(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Cancel");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd cancel : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1129,7 +1129,7 @@ int vcd_dbus_server_cancel_request(DBusConnection* conn, DBusMessage* msg)
 
 /*
 * Dbus Widget-Daemon Server
-*/ 
+*/
 int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg)
 {
        DBusError err;
@@ -1145,7 +1145,7 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Widget Initialize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget initialize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1158,8 +1158,8 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg)
        reply = dbus_message_new_method_return(msg);
 
        if (NULL != reply) {
-               dbus_message_append_args(reply, 
-                       DBUS_TYPE_INT32, &ret, 
+               dbus_message_append_args(reply,
+                       DBUS_TYPE_INT32, &ret,
                        DBUS_TYPE_INVALID);
 
                if (0 == ret) {
@@ -1195,7 +1195,7 @@ int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Widget Finalize");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget finalize : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1242,14 +1242,14 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms
        int ret = VCD_ERROR_OPERATION_FAILED;
        int widget_command;
 
-       dbus_message_get_args(msg, &err, 
-               DBUS_TYPE_INT32, &pid, 
-               DBUS_TYPE_INT32, &widget_command, 
-               DBUS_TYPE_INVALID);
+       dbus_message_get_args(msg, &err,
+                                                 DBUS_TYPE_INT32, &pid,
+                                                 DBUS_TYPE_INT32, &widget_command,
+                                                 DBUS_TYPE_INVALID);
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget start recording");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget start recording : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1264,7 +1264,7 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms
        if (NULL != reply) {
                if (0 == ret) {
                        /* Append result and language */
-                       dbus_message_append_args( reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+                       dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
 
                        SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret);
                } else {
@@ -1296,14 +1296,14 @@ int vcd_dbus_server_widget_start(DBusConnection* conn, DBusMessage* msg)
 
        int pid;
        int silence;
-       
+
        int ret = VCD_ERROR_OPERATION_FAILED;
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget start");
 
        dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &silence, DBUS_TYPE_INVALID);
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd start : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1351,7 +1351,7 @@ int vcd_dbus_server_widget_stop(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget stop");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget stop : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
@@ -1399,7 +1399,7 @@ int vcd_dbus_server_widget_cancel(DBusConnection* conn, DBusMessage* msg)
 
        SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget cancel");
 
-       if (dbus_error_is_set(&err)) { 
+       if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget cancel : get arguments error (%s)", err.message);
                dbus_error_free(&err);
                ret = VCD_ERROR_OPERATION_FAILED;
index 40f58dc..2af9dac 100644 (file)
@@ -81,7 +81,7 @@ int vcd_dbus_server_cancel_request(DBusConnection* conn, DBusMessage* msg);
 
 /*
 * Dbus Server functions for widget
-*/ 
+*/
 int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg);
 
 int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg);
index c4c2681..8a4810d 100644 (file)
@@ -35,7 +35,7 @@ typedef struct {
 
        /* engine load info */
        bool    is_set;
-       bool    is_loaded;      
+       bool    is_loaded;
        bool    is_command_ready;
        void    *handle;
 
@@ -61,7 +61,7 @@ typedef struct _vcengine_info {
 static bool g_agent_init;
 
 /** vc engine list */
-static GList *g_engine_list;           
+static GList *g_engine_list;
 
 /** current engine information */
 static vcengine_s g_dynamic_engine;
@@ -82,7 +82,7 @@ void __free_language_list(GList* lang_list);
 
 
 /*
-* Internal Interfaces 
+* Internal Interfaces
 */
 
 /** check engine id */
@@ -159,7 +159,7 @@ int vcd_engine_agent_release()
        }
 
        g_list_free(iter);
-       
+
        /* release current engine data */
        if (NULL != g_dynamic_engine.pefuncs)   free(g_dynamic_engine.pefuncs);
        if (NULL != g_dynamic_engine.pdfuncs)   free(g_dynamic_engine.pdfuncs);
@@ -173,16 +173,16 @@ int vcd_engine_agent_release()
 
 bool vcd_engine_is_available_engine()
 {
-       if (true == g_dynamic_engine.is_loaded) 
+       if (true == g_dynamic_engine.is_loaded)
                return true;
-       
+
        return false;
 }
 
 int vcd_engine_agent_initialize_current_engine()
 {
        /* check agent init */
-       if (false == g_agent_init ) {
+       if (false == g_agent_init) {
                SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Not Initialized");
                return VCD_ERROR_OPERATION_FAILED;
        }
@@ -238,7 +238,7 @@ int vcd_engine_agent_initialize_current_engine()
                SLOG(LOG_DEBUG, TAG_VCD, " Dynamic engine name : %s", g_dynamic_engine.engine_name);
                SLOG(LOG_DEBUG, TAG_VCD, " Dynamic engine path : %s", g_dynamic_engine.engine_path);
                SLOG(LOG_DEBUG, TAG_VCD, "-----");
-               
+
        }
 
        return 0;
@@ -260,7 +260,7 @@ int __internal_check_engine_id(const char* engine_uuid)
 
                while (NULL != iter) {
                        data = iter->data;
-                       
+
                        if (0 == strncmp(engine_uuid, data->engine_uuid, strlen(data->engine_uuid))) {
                                return 0;
                        }
@@ -374,7 +374,7 @@ int __internal_update_engine_list()
                                if (NULL != data->engine_uuid)          free(data->engine_uuid);
                                if (NULL != data->engine_path)          free(data->engine_path);
                                if (NULL != data->engine_name)          free(data->engine_name);
-                               
+
                                free(data);
                        }
 
@@ -430,14 +430,14 @@ int __internal_update_engine_list()
        } else {
                SLOG(LOG_WARN, TAG_VCD, "[Engine Agent WARNING] Fail to open default directory");
        }
-       
+
        if (0 >= g_list_length(g_engine_list)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] No Engine");
-               return VCD_ERROR_ENGINE_NOT_FOUND;      
+               return VCD_ERROR_ENGINE_NOT_FOUND;
        }
 
        __log_enginelist();
-       
+
        return 0;
 }
 
@@ -521,7 +521,7 @@ int __load_engine(vcengine_s* engine)
                return VCD_ERROR_OPERATION_FAILED;
        }
 
-       SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] engine info : version(%d), size(%d)",engine->pefuncs->version, engine->pefuncs->size);
+       SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] engine info : version(%d), size(%d)", engine->pefuncs->version, engine->pefuncs->size);
 
        /* engine error check */
        if (engine->pefuncs->size != sizeof(vcpe_funcs_s)) {
@@ -548,7 +548,7 @@ int __load_engine(vcengine_s* engine)
                SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to initialize vc-engine");
                return VCD_ERROR_OPERATION_FAILED;
        }
-       
+
        if (0 != engine->pefuncs->set_result_cb(__result_cb, NULL)) {
                SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to set result callback of vc-engine");
                return VCD_ERROR_OPERATION_FAILED;
@@ -587,7 +587,7 @@ int vcd_engine_agent_load_current_engine()
                        SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Load dynamic engine");
                }
        }
-       
+
        return 0;
 }
 
@@ -653,7 +653,7 @@ int vcd_engine_recognize_start(bool silence)
 
        int ret = -1;
        SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] silence is %s", silence ? "true" : "false");
-       
+
        if (true == g_dynamic_engine.is_loaded && true == g_dynamic_engine.is_command_ready) {
                ret = g_dynamic_engine.pefuncs->start(silence);
                if (0 != ret) {
@@ -729,7 +729,7 @@ int vcd_engine_recognize_cancel()
                if (0 != ret) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to cancel dynamic engine error(%d)", ret);
                }
-       } 
+       }
 
        return 0;
 }
@@ -803,7 +803,7 @@ int vcd_engine_supported_langs(GList** lang_list)
                SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] get language list error(%d)", ret);
                return VCD_ERROR_OPERATION_FAILED;
        }
-       
+
        return 0;
 }
 
@@ -846,7 +846,7 @@ int vcd_engine_set_current_language(const char* language)
                ret = g_dynamic_engine.pefuncs->set_language(language);
                if (0 != ret) {
                        SLOG(LOG_WARN, TAG_VCD, "[Engine Agent] Fail to set language of dynamic engine error(%d, %s)", ret, language);
-               } 
+               }
        } else {
                SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Dynamic engine is not available (Cannot start)");
        }
@@ -869,7 +869,7 @@ void __free_language_list(GList* lang_list)
 
                        if (NULL != data)
                                free(data);
-                       
+
                        lang_list = g_list_remove_link(lang_list, iter);
 
                        iter = g_list_first(lang_list);
@@ -889,7 +889,7 @@ int __log_enginelist()
 
                SLOG(LOG_DEBUG, TAG_VCD, "--------------- engine list -------------------");
 
-               int i = 1;      
+               int i = 1;
                while (NULL != iter) {
                        /* Get handle data from list */
                        data = iter->data;
index 462f1fb..fbbfb71 100644 (file)
@@ -26,13 +26,13 @@ extern "C" {
 #endif
 
 /*
-* Constants & Structures       
+* Constants & Structures
 */
 
 #define        ENGINE_PATH_SIZE 256
 
-typedef void (*result_callback)(vcp_result_event_e event, int* result_id, int count, 
-                               const char* all_result, const char* non_fixed_result, const char* msg, void *user_data);
+typedef void (*result_callback)(vcp_result_event_e event, int* result_id, int count, const char* all_result,
+                                                               const char* non_fixed_result, const char* msg, void *user_data);
 
 typedef void (*silence_dectection_callback)(void *user_data);
 
index 4de03e8..be92c7e 100644 (file)
@@ -41,7 +41,7 @@ int main(int argc, char** argv)
                perm_app_set_privilege("voice-control", NULL, NULL);
        }
 
-       if (0 != vcd_dbus_open_connection()) {
+       if (0 != vcd_dbus_open_connection()) {
                SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to open connection");
                return EXIT_FAILURE;
        }
index 2e72e7c..51af598 100644 (file)
@@ -51,9 +51,9 @@ extern "C" {
 #define ENGINE_DIRECTORY_DOWNLOAD_SETTING      "/opt/usr/voice/vc/setting"
 
 /* for debug message */
-// #define RECORDER_DEBUG
+/* #define RECORDER_DEBUG */
 #define CLIENT_DATA_DEBUG
-// #define COMMAND_DATA_DEBUG
+/* #define COMMAND_DATA_DEBUG */
 
 typedef enum {
        VCD_ERROR_NONE                  = TIZEN_ERROR_NONE,                     /**< Successful */
@@ -69,14 +69,14 @@ typedef enum {
        VCD_ERROR_ENGINE_NOT_FOUND      = TIZEN_ERROR_VOICE_CONTROL | 0x013,    /**< No available engine */
        VCD_ERROR_OPERATION_FAILED      = TIZEN_ERROR_VOICE_CONTROL | 0x014,    /**< Operation failed */
        VCD_ERROR_OPERATION_REJECTED    = TIZEN_ERROR_VOICE_CONTROL | 0x015     /**< Operation rejected */
-}vcd_error_e;
+} vcd_error_e;
 
 typedef enum {
        VCD_STATE_NONE = 0,
        VCD_STATE_READY = 1,
        VCD_STATE_RECORDING = 2,
        VCD_STATE_PROCESSING = 3
-}vcd_state_e;
+} vcd_state_e;
 
 
 #ifdef __cplusplus
index 77b522f..333abfd 100644 (file)
 #include "voice_control_plugin_engine.h"
 
 /* Multi session enable */
-//#define AUDIO_MULTI_SESSION
+/*#define AUDIO_MULTI_SESSION */
 
 /* TV BT enable */
-//#define TV_BT_MODE
+/*#define TV_BT_MODE */
 
 #define FRAME_LENGTH 160
 #define BUFFER_LENGTH FRAME_LENGTH * 2
@@ -194,7 +194,7 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb
        g_audio_type = VCP_AUDIO_TYPE_PCM_S16_LE;
        g_audio_rate = 16000;
        g_audio_channel = 1;
-       
+
        audio_channel_e audio_ch;
        audio_sample_type_e audio_type;
 
@@ -443,7 +443,7 @@ static float get_volume_decibel(char* data, int size)
 
        int i, depthByte;
        int count = 0;
-       
+
        float db = 0.0;
        float rms = 0.0;
        unsigned long long square_sum = 0;
@@ -463,7 +463,6 @@ static float get_volume_decibel(char* data, int size)
                rms = sqrt(square_sum/count);
 
        db = 20 * log10(rms/MAX_AMPLITUDE_MEAN_16);
-
        return db;
 }
 
@@ -483,7 +482,7 @@ Eina_Bool __read_normal_func(void *data)
                SLOG(LOG_WARN, TAG_VCD, "[Recorder WARNING] Fail to read audio : %d", ret);
                g_recorder_state = VCD_RECORDER_STATE_READY;
                return EINA_FALSE;
-       } 
+       }
 
        if (NULL != g_audio_cb) {
                if (0 != g_audio_cb(g_normal_buffer, BUFFER_LENGTH)) {
@@ -495,7 +494,7 @@ Eina_Bool __read_normal_func(void *data)
 
        if (0 == g_buffer_count || 0 == g_buffer_count % 50) {
                SLOG(LOG_WARN, TAG_VCD, "[Recorder][%d] Recording... : read_size(%d)", g_buffer_count, ret);
-               
+
                if (100000 == g_buffer_count) {
                        g_buffer_count = 0;
                }
@@ -593,7 +592,7 @@ int vcd_recorder_start()
        g_normal_file = fopen(normal_file_name, "wb+");
        if (!g_normal_file) {
                SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] File not found!");
-       }       
+       }
 #endif
        return 0;
 }
@@ -647,4 +646,4 @@ int vcd_recorder_stop()
 int vcd_recorder_get_state()
 {
        return g_recorder_state;
-}
\ No newline at end of file
+}
index 93b9b36..dafef24 100644 (file)
@@ -28,7 +28,7 @@ extern "C" {
 typedef enum {
        VCD_RECORDER_STATE_READY,       /**< Recorder is ready to start */
        VCD_RECORDER_STATE_RECORDING,   /**< In the middle of recording */
-}vcd_recorder_state_e;
+} vcd_recorder_state_e;
 
 
 typedef int (*vcd_recoder_audio_cb)(const void* data, const unsigned int length);
index 5f4adca..0781eb7 100644 (file)
@@ -131,7 +131,7 @@ static void __config_foreground_changed_cb(int previous, int current, void* user
        SLOG(LOG_DEBUG, TAG_VCD, "===== Change foreground");
 
        SLOG(LOG_DEBUG, TAG_VCD, "Foreground pid(%d)", current);
-       
+
        if (VC_NO_FOREGROUND_PID != current) {
                /* Foreground app is changed */
                vcd_state_e state = vcd_config_get_service_state();
@@ -152,9 +152,8 @@ static Eina_Bool __vcd_send_selected_result(void *data)
        GSList* pid_list = NULL;
        if (0 != vc_info_parser_get_result_pid_list(&pid_list)) {
                SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] Fail to get pid list. No result");
-       }
-       else {
-               if (0 < g_slist_length(pid_list)){
+       } else {
+               if (0 < g_slist_length(pid_list)) {
                        GSList* iter = NULL;
                        vc_cmd_s* temp_cmd = NULL;
                        int ret = 0;
@@ -256,7 +255,7 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int
        }
 
        int i = 0;
-       for (i = 0;i < count;i++) {
+       for (i = 0; i < count; i++) {
                SLOG(LOG_DEBUG, TAG_VCD, "[Server]   [%d] Result ID(%d)", i, result_id[i]);
 
                if (result_id[i] < 0) {
@@ -496,7 +495,7 @@ Eina_Bool vcd_cleanup_client(void *data)
        if (0 == vcd_client_get_list(&client_list, &client_count)) {
                SLOG(LOG_DEBUG, TAG_VCD, "===== Clean up client ");
                if (NULL != client_list && client_count > 0) {
-                       for (i = 0;i < client_count;i++) {
+                       for (i = 0; i < client_count; i++) {
                                result = vcdc_send_hello(client_list[i], VCD_CLIENT_TYPE_NORMAL);
 
                                if (0 == result) {
@@ -518,7 +517,7 @@ Eina_Bool vcd_cleanup_client(void *data)
        if (0 == vcd_client_widget_get_list(&client_list, &client_count)) {
                SLOG(LOG_DEBUG, TAG_VCD, "===== Clean up widget");
                if (NULL != client_list && client_count > 0) {
-                       for (i = 0;i < client_count;i++) {
+                       for (i = 0; i < client_count; i++) {
                                result = vcdc_send_hello(client_list[i], VCD_CLIENT_TYPE_WIDGET);
 
                                if (0 == result) {
@@ -532,6 +531,7 @@ Eina_Bool vcd_cleanup_client(void *data)
                SLOG(LOG_DEBUG, TAG_VCD, "=====");
                SLOG(LOG_DEBUG, TAG_VCD, "  ");
        }
+
        if (NULL != client_list) {
                free(client_list);
                client_list = NULL;
@@ -645,7 +645,7 @@ int vcd_server_mgr_set_audio_type(int pid, const char* audio_type)
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] The manager pid(%d) is NOT valid", pid);
                return VCD_ERROR_INVALID_PARAMETER;
        }
-       
+
        int ret = 0;
        vcp_audio_type_e type = VCP_AUDIO_TYPE_PCM_S16_LE;
        int rate = 16000;
@@ -673,7 +673,7 @@ int vcd_server_mgr_get_audio_type(int pid, char** audio_type)
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] The manager pid(%d) is NOT valid", pid);
                return VCD_ERROR_INVALID_PARAMETER;
        }
-       
+
        int ret = vcd_recorder_get(audio_type);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get audio in type : %d", ret);
@@ -765,7 +765,7 @@ int vcd_server_mgr_start(bool stop_by_silence, bool exclusive_cmd, bool start_by
 {
        /* 1. check current state */
        vcd_state_e state = vcd_config_get_service_state();
-       
+
        if (VCD_STATE_READY != state) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Current state is not ready");
                return VCD_ERROR_INVALID_STATE;
@@ -791,7 +791,7 @@ int vcd_server_mgr_start(bool stop_by_silence, bool exclusive_cmd, bool start_by
                if (0 != vcd_config_get_foreground(&fg_pid)) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get foreground");
                }
-               
+
                /* Set client exclusive option */
                if (0 != vcd_client_set_exclusive_command(fg_pid)) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set exclusive command");
@@ -965,7 +965,7 @@ int vcd_server_unset_command(int pid, vc_cmd_type_e cmd_type)
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to unset command type : pid(%d), cmd_type(%d)", pid, cmd_type);
                return VCD_ERROR_OPERATION_FAILED;
        }
-       
+
        return 0;
 }
 
@@ -989,7 +989,7 @@ int vcd_server_set_exclusive_command(int pid, bool value)
                        return VCD_ERROR_OPERATION_FAILED;
                }
        }
-       
+
        return 0;
 }