[ITC][Non-ACR][SVACE fixes for modules]

Change-Id: I9341b36c5ca097380b8d987851f26911d36f9718
Signed-off-by: Shilpa Jindal <shilpa.j@samsung.com>

diff --git a/src/itc/alarm/ITs-alarm-common.c b/src/itc/alarm/ITs-alarm-common.c
index 0abf2e2..a0adca4 100755 (executable)
--- a/src/itc/alarm/ITs-alarm-common.c
+++ b/src/itc/alarm/ITs-alarm-common.c
@@ -165,13 +165,12 @@ char* AppGetError(int nRet)
 */
 char* AppControlGetLaunchMode(app_control_launch_mode_e nRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Undefined Error";
 
        switch ( nRet )
        {
        case APP_CONTROL_LAUNCH_MODE_SINGLE:            szErrorVal = "APP_CONTROL_LAUNCH_MODE_SINGLE";  break;
        case APP_CONTROL_LAUNCH_MODE_GROUP:                     szErrorVal = "APP_CONTROL_LAUNCH_MODE_GROUP";   break;
-       default:                                                                        szErrorVal = "Undefined Error";                                 break;
        }
 
        return szErrorVal;

diff --git a/src/itc/application/ITs-application-common.c b/src/itc/application/ITs-application-common.c
index f8001a2..d76ccee 100755 (executable)
--- a/src/itc/application/ITs-application-common.c
+++ b/src/itc/application/ITs-application-common.c
@@ -189,13 +189,12 @@ char* AppGetError(int nRet)
 */
 char* AppControlGetLaunchMode(app_control_launch_mode_e nRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Undefined Error";
 
        switch ( nRet )
        {
        case APP_CONTROL_LAUNCH_MODE_SINGLE:            szErrorVal = "APP_CONTROL_LAUNCH_MODE_SINGLE";  break;
        case APP_CONTROL_LAUNCH_MODE_GROUP:                     szErrorVal = "APP_CONTROL_LAUNCH_MODE_GROUP";   break;
-       default:                                                                        szErrorVal = "Undefined Error";                                 break;
        }
 
        return szErrorVal;

diff --git a/src/itc/connection/ITs-connection-common.c b/src/itc/connection/ITs-connection-common.c
index 2332335..1fbf912 100755 (executable)
--- a/src/itc/connection/ITs-connection-common.c
+++ b/src/itc/connection/ITs-connection-common.c
@@ -61,7 +61,7 @@ char* ConnectionGetError(connection_error_e nRet)
 */
 char* ConnectionGetCellularStateType(connection_cellular_state_e nState)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nState )
        {
        case CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE:                          szType = "CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE";            break; /**< Out of service */
@@ -70,7 +70,6 @@ char* ConnectionGetCellularStateType(connection_cellular_state_e nState)
        case CONNECTION_CELLULAR_STATE_CALL_ONLY_AVAILABLE:             szType = "CONNECTION_CELLULAR_STATE_CALL_ONLY_AVAILABLE";       break;/**< Call is only available */
        case CONNECTION_CELLULAR_STATE_AVAILABLE:                                       szType = "CONNECTION_CELLULAR_STATE_AVAILABLE";                         break; /**< Available but not connected yet */
        case CONNECTION_CELLULAR_STATE_CONNECTED:                                       szType = "CONNECTION_CELLULAR_STATE_CONNECTED";                         break; /**< Connected */
-       default:                                                                                                        szType = "Unknown State";                                                                       break;
        }
        return szType;
 }
@@ -83,7 +82,7 @@ char* ConnectionGetCellularStateType(connection_cellular_state_e nState)
 */
 char* ConnectionGetType(connection_type_e nType)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nType )
        {
        case CONNECTION_TYPE_DISCONNECTED:                              szType = "CONNECTION_TYPE_DISCONNECTED";                break; /**< Disconnected */
@@ -92,7 +91,6 @@ char* ConnectionGetType(connection_type_e nType)
        case CONNECTION_TYPE_ETHERNET:                                  szType = "CONNECTION_TYPE_ETHERNET";                    break; /**< Ethernet type */
        case CONNECTION_TYPE_BT:                                                szType = "CONNECTION_TYPE_BT";                                  break;  /**< Bluetooth type */
        case CONNECTION_TYPE_NET_PROXY:                                 szType = "CONNECTION_TYPE_NET_PROXY";                   break;  /**Proxy type for internet connection(since 3.0)**/
-       default :                                                                               szType = "Unknown Type";                                                break;
        }
        return szType;
 }
@@ -105,12 +103,11 @@ char* ConnectionGetType(connection_type_e nType)
 */
 char* ConnectionGetAddressFamily(connection_address_family_e nFamily)
 {
-       char *szFamily = NULL;
+       char *szFamily = "Unknown Address Family";
        switch ( nFamily )
        {
        case CONNECTION_ADDRESS_FAMILY_IPV4:            szFamily = "CONNECTION_ADDRESS_FAMILY_IPV4";            break; /**< Disconnected */
        case CONNECTION_ADDRESS_FAMILY_IPV6:            szFamily = "CONNECTION_ADDRESS_FAMILY_IPV6";            break; /**< Wi-Fi type */
-       default :                                                                       szFamily = "Unknown Address Family";                            break;
        }
        return szFamily;
 }
@@ -123,7 +120,7 @@ char* ConnectionGetAddressFamily(connection_address_family_e nFamily)
 */
 char* ConnectionGetCellularServiceType(connection_cellular_service_type_e nRet)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nRet )
        {
        case CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN:                                  szType = "CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN";                            break;  /**< Unknown */
@@ -133,7 +130,6 @@ char* ConnectionGetCellularServiceType(connection_cellular_service_type_e nRet)
        case CONNECTION_CELLULAR_SERVICE_TYPE_PREPAID_MMS:                              szType = "CONNECTION_CELLULAR_SERVICE_TYPE_PREPAID_MMS";                        break;  /**< Prepaid MMS */
        case CONNECTION_CELLULAR_SERVICE_TYPE_TETHERING:                                szType = "CONNECTION_CELLULAR_SERVICE_TYPE_TETHERING";                          break;  /**< Tethering */
        case CONNECTION_CELLULAR_SERVICE_TYPE_APPLICATION:                              szType = "CONNECTION_CELLULAR_SERVICE_TYPE_APPLICATION";                        break; /**< Specific application */
-       default :                                                                                                               szType = "Unknown Type";                                                                                        break;
        }
        return szType;
 }
@@ -167,13 +163,12 @@ char* ConnectionGetCellularPdnType(connection_cellular_pdn_type_e nRet)
 */
 char* ConnectionGetCellularAuthType(connection_cellular_auth_type_e nRet)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nRet )
        {
        case CONNECTION_CELLULAR_AUTH_TYPE_NONE:        szType = "CONNECTION_CELLULAR_AUTH_TYPE_NONE";  break;                                  /**< Unknown */
        case CONNECTION_CELLULAR_AUTH_TYPE_PAP:         szType = "CONNECTION_CELLULAR_AUTH_TYPE_PAP";   break;                                  /**< Internet */
        case CONNECTION_CELLULAR_AUTH_TYPE_CHAP:        szType = "CONNECTION_CELLULAR_AUTH_TYPE_CHAP";  break;                                  /**< MMS */
-       default :                                                                       szType = "Unknown Type";                                                break;
        }
        return szType;
 }
@@ -186,7 +181,7 @@ char* ConnectionGetCellularAuthType(connection_cellular_auth_type_e nRet)
 */
 char* ConnectionGetIpConfigType(connection_ip_config_type_e nRet)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nRet )
        {
        case CONNECTION_IP_CONFIG_TYPE_NONE:                    szType = "CONNECTION_IP_CONFIG_TYPE_NONE";              break;                           /**< Unknown */
@@ -194,7 +189,6 @@ char* ConnectionGetIpConfigType(connection_ip_config_type_e nRet)
        case CONNECTION_IP_CONFIG_TYPE_DYNAMIC:                 szType = "CONNECTION_IP_CONFIG_TYPE_DYNAMIC";   break;
        case CONNECTION_IP_CONFIG_TYPE_AUTO:                    szType = "CONNECTION_IP_CONFIG_TYPE_AUTO";              break;
        case CONNECTION_IP_CONFIG_TYPE_FIXED:                   szType = "CONNECTION_IP_CONFIG_TYPE_FIXED";     break;
-       default :                                                                               szType = "Unknown Type";                                                break;
        }
        return szType;
 }
@@ -207,13 +201,12 @@ char* ConnectionGetIpConfigType(connection_ip_config_type_e nRet)
 */
 char* ConnectionGetProxyType(connection_proxy_type_e nType)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nType )
        {
        case CONNECTION_PROXY_TYPE_DIRECT:                      szType = "CONNECTION_PROXY_TYPE_DIRECT";                break;
        case CONNECTION_PROXY_TYPE_AUTO:                        szType = "CONNECTION_PROXY_TYPE_AUTO";                  break;
        case CONNECTION_PROXY_TYPE_MANUAL:                      szType = "CONNECTION_PROXY_TYPE_MANUAL";                break;
-       default :                                                                       szType = "Unknown Type";                                                break;
        }
        return szType;
 }
@@ -226,13 +219,12 @@ char* ConnectionGetProxyType(connection_proxy_type_e nType)
 */
 char* ConnectionGetIteratorType(connection_iterator_type_e nType)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nType )
        {
        case CONNECTION_ITERATOR_TYPE_REGISTERED:               szType = "CONNECTION_ITERATOR_TYPE_REGISTERED";                 break;
        case CONNECTION_ITERATOR_TYPE_CONNECTED:                szType = "CONNECTION_ITERATOR_TYPE_CONNECTED";                  break;
        case CONNECTION_ITERATOR_TYPE_DEFAULT:                  szType = "CONNECTION_ITERATOR_TYPE_DEFAULT";                    break;
-       default :                                                                               szType = "Unknown Type";                                                                break;
        }
        return szType;
 }
@@ -245,14 +237,13 @@ char* ConnectionGetIteratorType(connection_iterator_type_e nType)
 */
 char* ConnectionGetStatisticTypeData(connection_statistics_type_e nType)
 {
-       char *szType = NULL;
+       char *szType = "Unknown State";
        switch ( nType )
        {
        case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:             szType = "CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA";               break;
        case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:                         szType = "CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA";                   break;
        case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:            szType = "CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA";              break;
        case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:                        szType = "CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA";                  break;
-       default :                                                                                                       szType = "Unknown Type";                                                                                break;
        }
        return szType;
 }

diff --git a/src/itc/efl-ext/ITs-efl-ext-common.c b/src/itc/efl-ext/ITs-efl-ext-common.c
index ad8739a..9208b76 100755 (executable)
--- a/src/itc/efl-ext/ITs-efl-ext-common.c
+++ b/src/itc/efl-ext/ITs-efl-ext-common.c
@@ -183,14 +183,13 @@ bool CreateFloatingButon()
 */
 char* EflExtGetFloatingButtonModeType(Eext_Floatingbutton_Mode eMode)
 {
-       char *szModeType = NULL;
+       char *szModeType = "Unknown Mode Type";
 
        switch ( eMode )
        {
        case EEXT_FLOATINGBUTTON_MODE_DEFAULT:          szModeType = "EEXT_FLOATINGBUTTON_MODE_DEFAULT";                break;
        case EEXT_FLOATINGBUTTON_MODE_BOTH_SIDES:       szModeType = "EEXT_FLOATINGBUTTON_MODE_BOTH_SIDES";             break;
        case EEXT_FLOATINGBUTTON_MODE_LAST:                     szModeType = "EEXT_FLOATINGBUTTON_MODE_LAST";                   break;
-       default:                                                                        szModeType = "Unknown Mode Type";                                               break;
        }
 
        return szModeType;
@@ -204,7 +203,7 @@ char* EflExtGetFloatingButtonModeType(Eext_Floatingbutton_Mode eMode)
 */
 char* EflExtGetFloatingButtonPosType(Eext_Floatingbutton_Pos ePos)
 {
-       char *szPosType = NULL;
+       char *szPosType = "Unknown Mode Type";
 
        switch ( ePos )
        {
@@ -214,7 +213,6 @@ char* EflExtGetFloatingButtonPosType(Eext_Floatingbutton_Pos ePos)
        case EEXT_FLOATINGBUTTON_RIGHT:                 szPosType = "EEXT_FLOATINGBUTTON_RIGHT";                break;
        case EEXT_FLOATINGBUTTON_RIGHT_OUT:             szPosType = "EEXT_FLOATINGBUTTON_RIGHT_OUT";    break;
        case EEXT_FLOATINGBUTTON_LAST:                  szPosType = "EEXT_FLOATINGBUTTON_LAST";                 break;
-       default:                                                                szPosType = "Unknown Mode Type";                                break;
        }
 
        return szPosType;

diff --git a/src/itc/oauth2/ITs-oauth2-common.c b/src/itc/oauth2/ITs-oauth2-common.c
index 50cf8ef..a344859 100755 (executable)
--- a/src/itc/oauth2/ITs-oauth2-common.c
+++ b/src/itc/oauth2/ITs-oauth2-common.c
@@ -59,7 +59,7 @@ char* Oauth2InfoGetError(int nRet)
 */
 char* Oauth2GrantType(oauth2_grant_type_e nRet)
 {
-    char *szGrantVal = NULL;
+    char *szGrantVal = "Unknown Type";
 
     switch ( nRet )
     {
@@ -67,7 +67,6 @@ char* Oauth2GrantType(oauth2_grant_type_e nRet)
     case OAUTH2_GRANT_TYPE_PASSWORD:                   szGrantVal = "OAUTH2_GRANT_TYPE_PASSWORD";                              break;
     case OAUTH2_GRANT_TYPE_CLIENT_CREDENTIALS: szGrantVal = "OAUTH2_GRANT_TYPE_CLIENT_CREDENTIALS";    break;
     case OAUTH2_GRANT_TYPE_REFRESH:                            szGrantVal = "OAUTH2_GRANT_TYPE_REFRESH";                               break;
-    default:                                                                   szGrantVal = "Unknown Type";                                                    break;
     }
 
     return szGrantVal;
@@ -81,13 +80,12 @@ char* Oauth2GrantType(oauth2_grant_type_e nRet)
 */
 char* Oauth2ResponseType(oauth2_response_type_e nRet)
 {
-    char *szResponseVal = NULL;
+    char *szResponseVal = "Unknown Type";
 
     switch ( nRet )
     {
     case OAUTH2_RESPONSE_TYPE_CODE:                    szResponseVal = "OAUTH2_RESPONSE_TYPE_CODE";            break;
     case OAUTH2_RESPONSE_TYPE_TOKEN:           szResponseVal = "OAUTH2_RESPONSE_TYPE_TOKEN";           break;
-    default:                                                           szResponseVal = "Unknown Type";                                         break;
     }
 
     return szResponseVal;
@@ -101,14 +99,13 @@ char* Oauth2ResponseType(oauth2_response_type_e nRet)
 */
 char* Oauth2GetAuthType(oauth2_client_authentication_type_e nRet)
 {
-    char *szAuthVal = NULL;
+    char *szAuthVal = "Unknown Type";
 
     switch (nRet)
     {
     case OAUTH2_CLIENT_AUTHENTICATION_TYPE_BASIC:                      szAuthVal = "OAUTH2_CLIENT_AUTHENTICATION_TYPE_BASIC";                  break;
     case OAUTH2_CLIENT_AUTHENTICATION_TYPE_DIGEST:                     szAuthVal = "OAUTH2_CLIENT_AUTHENTICATION_TYPE_DIGEST";                 break;
     case OAUTH2_CLIENT_AUTHENTICATION_TYPE_REQUEST_BODY:       szAuthVal = "OAUTH2_CLIENT_AUTHENTICATION_TYPE_REQUEST_BODY";   break;
-    default:                                                                                           szAuthVal = "Unknown Type";                                                                             break;
     }
 
     return szAuthVal;

diff --git a/src/itc/push/ITs-push-service.c b/src/itc/push/ITs-push-service.c
index 31af86e..ddc5fb5 100755 (executable)
--- a/src/itc/push/ITs-push-service.c
+++ b/src/itc/push/ITs-push-service.c
@@ -193,8 +193,7 @@ static void GetNotificationDataPushServiceStateCB(push_service_state_e st, const
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
+
        }
 
        if ( g_pPushMainLoop )
@@ -270,8 +269,6 @@ static void GetNotificationMessagePushServiceStateCB(push_service_state_e st, co
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -337,8 +334,6 @@ static void GetNotificationTimePushServiceStateCB(push_service_state_e st, const
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
        if ( g_pPushMainLoop )
        {
@@ -404,8 +399,6 @@ static void GetNotificationSenderPushServiceStateCB(push_service_state_e st, con
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -472,8 +465,6 @@ static void GetNotificationSessionInfoPushServiceStateCB(push_service_state_e st
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -541,8 +532,6 @@ static void GetNotificationRequestIdPushServiceStateCB(push_service_state_e st,
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -609,8 +598,6 @@ static void GetNotificationTypePushServiceStateCB(push_service_state_e st, const
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -664,8 +651,6 @@ static void GetNotificationRequestUnreadPushServiceStateCB(push_service_state_e
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )
@@ -726,8 +711,6 @@ static void GetNotificationUnreadFreeNotificationCB(push_service_state_e st, con
        case PUSH_SERVICE_STATE_ERROR  :
                FPRINTF("[Line : %d][%s] Service State: PUSH_SERVICE_STATE_ERROR\\n", __LINE__, API_NAMESPACE);
                break;
-       default:
-               break;
        }
 
        if ( g_pPushMainLoop )

diff --git a/src/itc/sensor/ITs-sensor-common.c b/src/itc/sensor/ITs-sensor-common.c
index 767690b..d653077 100755 (executable)
--- a/src/itc/sensor/ITs-sensor-common.c
+++ b/src/itc/sensor/ITs-sensor-common.c
@@ -95,14 +95,13 @@ char* SensorGetType(sensor_type_e nSensorType)
 */
 char* SensorOption(sensor_option_e nSensorOption)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Error";
        switch ( nSensorOption )
        {
        case SENSOR_OPTION_DEFAULT:                                     szErrorVal = "SENSOR_OPTION_DEFAULT";                                   break;
        case SENSOR_OPTION_ON_IN_SCREEN_OFF:                    szErrorVal = "SENSOR_OPTION_ON_IN_SCREEN_OFF";                  break;
        case SENSOR_OPTION_ON_IN_POWERSAVE_MODE:                szErrorVal = "SENSOR_OPTION_ON_IN_POWERSAVE_MODE";              break;
        case SENSOR_OPTION_ALWAYS_ON:                                   szErrorVal = "SENSOR_OPTION_ALWAYS_ON";                                 break;  
-       default :                                                                               szErrorVal = "Unknown Error";                                                   break;
        }
        return szErrorVal;
 }
@@ -138,12 +137,12 @@ gboolean SensorTimeout(gpointer data)
 */     
 char* SensorAttributeOption(sensor_attribute_e nSensorAttrOption)      
 {      
-   char *szErrorVal = NULL;    
+   char *szErrorVal = "Unknown Error"; 
    switch ( nSensorAttrOption )        
    {   
           case SENSOR_ATTRIBUTE_AXIS_ORIENTATION:        szErrorVal = "SENSOR_ATTRIBUTE_AXIS_ORIENTATION";              break; 
           case SENSOR_ATTRIBUTE_PAUSE_POLICY:            szErrorVal = "SENSOR_ATTRIBUTE_PAUSE_POLICY";                  break;         
-          default :                                      szErrorVal= "Unknown Error";                                                           break; 
+       
    }   
    return szErrorVal;  
 }                      

diff --git a/src/itc/stt/ITs-stt-common.c b/src/itc/stt/ITs-stt-common.c
index 77d68ec..d53966a 100755 (executable)
--- a/src/itc/stt/ITs-stt-common.c
+++ b/src/itc/stt/ITs-stt-common.c
@@ -102,13 +102,12 @@ char* StteGetError(stte_error_e nError)
 */
 char* SttGetOptionForSilenceDetection(stt_option_silence_detection_e nOption)
 {
-       char *szOption = NULL;
+       char *szOption = "Undefined Option";
        switch ( nOption )
        {
        case STT_OPTION_SILENCE_DETECTION_FALSE:        szOption = "STT_OPTION_SILENCE_DETECTION_FALSE";        break;
        case STT_OPTION_SILENCE_DETECTION_TRUE:         szOption = "STT_OPTION_SILENCE_DETECTION_TRUE";         break;
        case STT_OPTION_SILENCE_DETECTION_AUTO:         szOption = "STT_OPTION_SILENCE_DETECTION_AUTO";         break;
-       default:                                                                        szOption = "Undefined Option";                                          break;
        }
 
        return szOption;
@@ -122,13 +121,12 @@ char* SttGetOptionForSilenceDetection(stt_option_silence_detection_e nOption)
 */
 char* SttGetResultEvent(stt_result_event_e nEvent)
 {
-       char *szEvent = NULL;
+       char *szEvent = "Undefined Option";
        switch ( nEvent )
        {
        case STT_RESULT_EVENT_FINAL_RESULT:             szEvent = "STT_RESULT_EVENT_FINAL_RESULT";              break;
        case STT_RESULT_EVENT_PARTIAL_RESULT:   szEvent = "STT_RESULT_EVENT_PARTIAL_RESULT";    break;
        case STT_RESULT_EVENT_ERROR:                    szEvent = "STT_RESULT_EVENT_ERROR";                             break;
-       default:                                                                szEvent = "Undefined Result Event";                             break;
        }
 
        return szEvent;
@@ -142,13 +140,12 @@ char* SttGetResultEvent(stt_result_event_e nEvent)
 */
 char* SttGetResultTimeEvent(stt_result_time_event_e nEvent)
 {
-       char *szEvent = NULL;
+       char *szEvent = "Undefined Result Time Event";
        switch ( nEvent )
        {
        case STT_RESULT_TIME_EVENT_BEGINNING:   szEvent = "STT_RESULT_TIME_EVENT_BEGINNING";    break;  //Event when the token is beginning type
        case STT_RESULT_TIME_EVENT_MIDDLE:              szEvent = "STT_RESULT_TIME_EVENT_MIDDLE";               break;  //Event when the token is middle type
        case STT_RESULT_TIME_EVENT_END:                 szEvent = "STT_RESULT_TIME_EVENT_END";                  break;  //Event when the token is end type
-       default:                                                                szEvent = "Undefined Result Time Event";                break;
        }
 
        return szEvent;
@@ -162,14 +159,13 @@ char* SttGetResultTimeEvent(stt_result_time_event_e nEvent)
 */
 char* SttGetState(stt_state_e nState)
 {
-       char *szState = NULL;
+       char *szState = "Undefined State";
        switch ( nState )
        {
        case STT_STATE_CREATED:         szState = "STT_STATE_CREATED";          break;
        case STT_STATE_READY:           szState = "STT_STATE_READY";            break;
        case STT_STATE_RECORDING:       szState = "STT_STATE_RECORDING";        break;
        case STT_STATE_PROCESSING:      szState = "STT_STATE_PROCESSING";       break;
-       default:                                        szState = "Undefined State";            break;
        }
 
        return szState;

diff --git a/src/itc/wifi/ITs-wifi-common.c b/src/itc/wifi/ITs-wifi-common.c
index 48653ee..edd92bf 100755 (executable)
--- a/src/itc/wifi/ITs-wifi-common.c
+++ b/src/itc/wifi/ITs-wifi-common.c
@@ -122,12 +122,11 @@ char* WifiGetError(int nRet)
 */
 char* WiFiAddressFamilyType(wifi_address_family_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Address Family";
        switch ( eRet )
        {
        case WIFI_ADDRESS_FAMILY_IPV4:                  szErrorVal = "WIFI_ADDRESS_FAMILY_IPV4";                break;
        case WIFI_ADDRESS_FAMILY_IPV6:                  szErrorVal = "WIFI_ADDRESS_FAMILY_IPV6";                break;
-       default:                                                                szErrorVal = "Unknown Address Family";                  break;
        }
 
        return szErrorVal;
@@ -141,13 +140,12 @@ char* WiFiAddressFamilyType(wifi_address_family_e eRet)
 */
 char* WiFiProxyType(wifi_proxy_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        case WIFI_PROXY_TYPE_DIRECT:                    szErrorVal = "WIFI_PROXY_TYPE_DIRECT";          break;
        case WIFI_PROXY_TYPE_AUTO:                              szErrorVal = "WIFI_PROXY_TYPE_AUTO";            break;
        case WIFI_PROXY_TYPE_MANUAL:                    szErrorVal = "WIFI_PROXY_TYPE_MANUAL";          break;
-       default:                                                                szErrorVal = "Unknown Type";                            break;
        }
 
        return szErrorVal;
@@ -161,7 +159,7 @@ char* WiFiProxyType(wifi_proxy_type_e eRet)
 */
 char* WiFiEAPType(wifi_eap_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        case WIFI_EAP_TYPE_PEAP:                        szErrorVal = "WIFI_EAP_TYPE_PEAP";                      break;
@@ -169,7 +167,6 @@ char* WiFiEAPType(wifi_eap_type_e eRet)
        case WIFI_EAP_TYPE_TTLS:                        szErrorVal = "WIFI_EAP_TYPE_TTLS";                      break;
        case WIFI_EAP_TYPE_SIM:                         szErrorVal = "WIFI_EAP_TYPE_SIM";                       break;
        case WIFI_EAP_TYPE_AKA:                         szErrorVal = "WIFI_EAP_TYPE_AKA";                       break;
-       default:                                                        szErrorVal = "Unknown Type";                            break;
        }
        return szErrorVal;
 }
@@ -182,7 +179,7 @@ char* WiFiEAPType(wifi_eap_type_e eRet)
 */
 char* WiFiEAPAuthType(wifi_eap_auth_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        case WIFI_EAP_AUTH_TYPE_NONE:                   szErrorVal = "WIFI_EAP_AUTH_TYPE_NONE";                 break;
@@ -191,7 +188,6 @@ char* WiFiEAPAuthType(wifi_eap_auth_type_e eRet)
        case WIFI_EAP_AUTH_TYPE_MSCHAPV2:               szErrorVal = "WIFI_EAP_AUTH_TYPE_MSCHAPV2";             break;
        case WIFI_EAP_AUTH_TYPE_MD5:                    szErrorVal = "WIFI_EAP_AUTH_TYPE_MD5";                  break;
        case WIFI_EAP_AUTH_TYPE_GTC:                    szErrorVal = "WIFI_EAP_AUTH_TYPE_GTC";                  break;
-       default:                                                                szErrorVal = "Unknown Type";                                    break;
        }
        return szErrorVal;
 }
@@ -204,7 +200,7 @@ char* WiFiEAPAuthType(wifi_eap_auth_type_e eRet)
 */
 char* WiFiIPConfigType(wifi_ip_config_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        case WIFI_IP_CONFIG_TYPE_NONE:                  szErrorVal = "WIFI_IP_CONFIG_TYPE_NONE";                        break;
@@ -212,7 +208,6 @@ char* WiFiIPConfigType(wifi_ip_config_type_e eRet)
        case WIFI_IP_CONFIG_TYPE_DYNAMIC:               szErrorVal = "WIFI_IP_CONFIG_TYPE_DYNAMIC";                     break;
        case WIFI_IP_CONFIG_TYPE_AUTO:                  szErrorVal = "WIFI_IP_CONFIG_TYPE_AUTO";                        break;
        case WIFI_IP_CONFIG_TYPE_FIXED:                 szErrorVal = "WIFI_IP_CONFIG_TYPE_FIXED";                       break;
-       default:                                                                szErrorVal = "Unknown Type";                                            break;
        }
        return szErrorVal;
 }
@@ -248,7 +243,7 @@ char* WifiGetConnectionState(wifi_connection_state_e eRet)
 */
 char* WifiSecurityType(wifi_security_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Security Type";
        switch ( eRet )
        {
        case WIFI_SECURITY_TYPE_NONE:                   szErrorVal = "WIFI_SECURITY_TYPE_NONE";                 break;
@@ -256,7 +251,6 @@ char* WifiSecurityType(wifi_security_type_e eRet)
        case WIFI_SECURITY_TYPE_WPA_PSK:                szErrorVal = "WIFI_SECURITY_TYPE_WPA_PSK";              break;
        case WIFI_SECURITY_TYPE_WPA2_PSK:               szErrorVal = "WIFI_SECURITY_TYPE_WPA2_PSK";             break;
        case WIFI_SECURITY_TYPE_EAP:                    szErrorVal = "WIFI_SECURITY_TYPE_EAP";                  break;
-       default:                                                                szErrorVal = "Unknown Security Type";                   break;
        }
 
        return szErrorVal;