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

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

diff --git a/src/itc/app-manager/ITs-app-manager-common.c b/src/itc/app-manager/ITs-app-manager-common.c
index 7c3df05..f92a39c 100755 (executable)
--- a/src/itc/app-manager/ITs-app-manager-common.c
+++ b/src/itc/app-manager/ITs-app-manager-common.c
@@ -102,14 +102,13 @@ char* AppManagerGetStaus(int nStatus)
 */
 char* AppManagerGetAppComponent(app_info_app_component_type_e nStatus)
 {
-       char *szStatusVal = NULL;
+       char *szStatusVal = "Unknown Value";
        switch ( nStatus )
        {
        case APP_INFO_APP_COMPONENT_TYPE_UI_APP:                        szStatusVal = "APP_INFO_APP_COMPONENT_TYPE_UI_APP";                     break;
        case APP_INFO_APP_COMPONENT_TYPE_SERVICE_APP:           szStatusVal = "APP_INFO_APP_COMPONENT_TYPE_SERVICE_APP";        break;
        case APP_INFO_APP_COMPONENT_TYPE_WIDGET_APP:            szStatusVal = "APP_INFO_APP_COMPONENT_TYPE_WIDGET_APP";         break;
        case APP_INFO_APP_COMPONENT_TYPE_WATCH_APP:                     szStatusVal = "APP_INFO_APP_COMPONENT_TYPE_WATCH_APP";          break;
-       default:                                                                                        szStatusVal = "Unknown Value";                                                          break;
        }
        return szStatusVal;
 } 

diff --git a/src/itc/attach-panel/ITs-attach-panel.c b/src/itc/attach-panel/ITs-attach-panel.c
index 9886395..ecc356a 100755 (executable)
--- a/src/itc/attach-panel/ITs-attach-panel.c
+++ b/src/itc/attach-panel/ITs-attach-panel.c
@@ -33,7 +33,8 @@ void ITs_attach_panel_startup(void)
        struct stat buf;
        if ( stat(ERR_LOG, &buf) == 0 )
        {
-               remove(ERR_LOG);
+               int nRet = remove(ERR_LOG);
+               PRINT_RESULT_NORETURN(0, nRet, "ITs_attach_panel_startup -remove", "Remove failed for ERR_LOG");
        }
 #if DEBUG
        FPRINTF("[Line : %d][%s] TEST SUIT start-up: ITs_attach-panel_startup\\n", __LINE__, API_NAMESPACE);

diff --git a/src/itc/base-utils/ITs-base-utils-common.h b/src/itc/base-utils/ITs-base-utils-common.h
index 17fd5e6..8018da7 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-common.h
+++ b/src/itc/base-utils/ITs-base-utils-common.h
@@ -92,24 +92,25 @@ bool g_bCallbackHit;
        }\
 }
 
-
-#define CHECK_HANDLE_CLEANUP(Handle, API, FreeResource) {\
-       if ( Handle == NULL )\
+#define CHECK_RETURN_VAL_CLEANUP(nVal, API,FreeResource) {\
+       if(nVal < 0)\
        {\
-               FPRINTF("[Line : %d][%s] %s failed, error returned = Handle returned is NULL\\n", __LINE__, API_NAMESPACE, API);\
+               FPRINTF("\\n[Line : %d][%s] %s failed, return value is less than zero \n", __LINE__, API_NAMESPACE, API);\
                FreeResource;\
                return 1;\
        }\
 }
 
-#define CHECK_HANDLE(Handle, API) {\
+#define CHECK_HANDLE_CLEANUP(Handle, API, FreeResource) {\
        if ( Handle == NULL )\
        {\
                FPRINTF("[Line : %d][%s] %s failed, error returned = Handle returned is NULL\\n", __LINE__, API_NAMESPACE, API);\
+               FreeResource;\
                return 1;\
        }\
 }
 
+
 #define FREE_MEMORY1(MEM1) {\
        if(MEM1 != NULL) \
        {\

diff --git a/src/itc/base-utils/ITs-base-utils-ubrk.c b/src/itc/base-utils/ITs-base-utils-ubrk.c
index 97d875b..0873845 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-ubrk.c
+++ b/src/itc/base-utils/ITs-base-utils-ubrk.c
@@ -560,7 +560,7 @@ int ITc_i18n_ubrk_get_rule_status_vec_p(void)
        }
        
        nIndex = i18n_ubrk_get_rule_status_vec(g_hUbrkIter, nArrayStatusVal, nCapacity);
-       CHECK_RETURN_VAL(nIndex, "i18n_ubrk_get_rule_status_vec");
+       CHECK_RETURN_VAL_CLEANUP(nIndex, "i18n_ubrk_get_rule_status_vec",FREE_MEMORY(pszUchar));
        
        int nRetVal = get_last_result();
        PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_ubrk_get_rule_status_vec", BaseUtilsGetError(nRetVal),FREE_MEMORY(pszUchar));

diff --git a/src/itc/base-utils/ITs-base-utils-ucalendar.c b/src/itc/base-utils/ITs-base-utils-ucalendar.c
index 3b82569..28df4d8 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-ucalendar.c
+++ b/src/itc/base-utils/ITs-base-utils-ucalendar.c
@@ -794,7 +794,7 @@ int ITc_i18n_ucalendar_set_timezone_p(void)
        }
        
        nLength =i18n_ucalendar_set_timezone(g_hUcalender, pszUcharCountryCode, nCapacity);
-       CHECK_RETURN_VAL(nLength, "i18n_ucalendar_set_timezone");
+       CHECK_RETURN_VAL_CLEANUP(nLength, "i18n_ucalendar_set_timezone",FREE_MEMORY(pszUcharCountryCode));
        
        nRetVal = get_last_result();
        PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_ucalendar_set_timezone", BaseUtilsGetError(nRetVal),FREE_MEMORY(pszUcharCountryCode));

diff --git a/src/itc/base-utils/ITs-base-utils-uchar-iter.c b/src/itc/base-utils/ITs-base-utils-uchar-iter.c
index 2e8df0a..08cfa39 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-uchar-iter.c
+++ b/src/itc/base-utils/ITs-base-utils-uchar-iter.c
@@ -44,7 +44,8 @@ void ITs_base_utils_uchar_iter_startup(void)
        struct stat stBuff;
        if ( stat(ERR_LOG, &stBuff) == 0 )
        {
-               remove(ERR_LOG);
+               int nRet = remove(ERR_LOG);
+               PRINT_RESULT_NORETURN(0, nRet, "ITs_base_utils_uchar_iter_startup -remove", "Remove failed for ERR_LOG");
        }
 #if DEBUG
        FPRINTF("[Line : %d][%s] TEST SUIT start-up: ITs_base_utils_uchar_iter_startup\\n", __LINE__, API_NAMESPACE);

diff --git a/src/itc/base-utils/ITs-base-utils-unumber.c b/src/itc/base-utils/ITs-base-utils-unumber.c
index 3914f3a..0c4fb64 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-unumber.c
+++ b/src/itc/base-utils/ITs-base-utils-unumber.c
@@ -781,7 +781,7 @@ int ITc_i18n_unumber_parse_p(void)
        
        nValue = i18n_unumber_parse(num_format, pText, 16, NULL);
        int nRetVal = get_last_result();
-       PRINT_RESULT(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse", BaseUtilsGetError(nRetVal));
+       PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse", BaseUtilsGetError(nRetVal),free(pText););
        
        if(nValue == -1)
        {
@@ -825,9 +825,9 @@ int ITc_i18n_unumber_parse_decimal_p(void)
        
        nLength = i18n_unumber_parse_decimal(num_format, pText, 16, NULL, szResult, nResultCapacity);
        int nRetVal = get_last_result();
-       PRINT_RESULT(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse_decimal", BaseUtilsGetError(nRetVal));
-       CHECK_HANDLE(szResult, "i18n_unumber_parse_decimal");
-       CHECK_RETURN_VAL(nResultCapacity, "i18n_unumber_parse_decimal");
+       PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse_decimal", BaseUtilsGetError(nRetVal),free(pText));
+       CHECK_HANDLE_CLEANUP(szResult, "i18n_unumber_parse_decimal",free(pText));
+       CHECK_RETURN_VAL_CLEANUP(nResultCapacity, "i18n_unumber_parse_decimal",free(pText););
        
        if(nLength == -1 )
        {
@@ -951,7 +951,7 @@ int ITc_i18n_unumber_parse_int64_p(void)
 
        nValue = i18n_unumber_parse_int64(num_format, pText, 16, NULL);
        int nRetVal = get_last_result();
-       PRINT_RESULT(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse_int64", BaseUtilsGetError(nRetVal));
+       PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal, "i18n_unumber_parse_int64", BaseUtilsGetError(nRetVal),free(pText););
        
        if(nValue == -1)
        {

diff --git a/src/itc/base-utils/ITs-base-utils-uset.c b/src/itc/base-utils/ITs-base-utils-uset.c
index 991faf0..4e9f5f0 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-uset.c
+++ b/src/itc/base-utils/ITs-base-utils-uset.c
@@ -137,12 +137,13 @@ int ITc_i18n_uset_create_pattern_p(void)
        if(pRet == NULL || nSourceLength <= 0)
        {
                FPRINTF("\\n[Line : %d][%s] i18n_ustring_copy_ua failed in precondition \n", __LINE__, API_NAMESPACE);
+               FREE_MEMORY1(_pattern);
                return 1;
        }
        
        //Target Api    
        int nRetVal = i18n_uset_create_pattern(_pattern, nSourceLength, &uset);
-       PRINT_RESULT(I18N_ERROR_NONE, nRetVal, "i18n_uset_create_pattern", BaseUtilsGetError(nRetVal));
+       PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal, "i18n_uset_create_pattern", BaseUtilsGetError(nRetVal),FREE_MEMORY1(_pattern));
        
        nRetVal = i18n_uset_destroy(uset);
        PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_uset_destroy", BaseUtilsGetError(nRetVal), FREE_MEMORY1(_pattern));
@@ -182,6 +183,7 @@ int ITc_i18n_uset_create_pattern_options_p(void)
        if(pRet == NULL || nSourceLength <= 0)
        {
                FPRINTF("\\n[Line : %d][%s] i18n_ustring_copy_ua failed in precondition \n", __LINE__, API_NAMESPACE);
+               FREE_MEMORY1(_pattern);
                return 1;
        }
        
@@ -193,8 +195,8 @@ int ITc_i18n_uset_create_pattern_options_p(void)
        {
                //Target Api
                nRetVal = i18n_uset_create_pattern_options(_pattern, nSourceLength, BitmaskType[nEnumCounter], &uset);
-               PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_uset_create_pattern_options", BaseUtilsGetError(nRetVal), i18n_uset_destroy(uset);
-               FREE_MEMORY1(_pattern));
+               PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_uset_create_pattern_options", BaseUtilsGetError(nRetVal), i18n_uset_destroy(uset);FREE_MEMORY1(_pattern));
+               FREE_MEMORY1(_pattern);
        }
        
        nRetVal = i18n_uset_destroy(uset);
@@ -394,6 +396,7 @@ int ITc_i18n_uset_apply_pattern_p(void)
        if(pRet == NULL || upattern_length <= 0)
        {
                FPRINTF("\\n[Line : %d][%s] i18n_ustring_copy_ua failed in precondition \n", __LINE__, API_NAMESPACE);
+               FREE_MEMORY1(upattern);
                return 1;
        }
        
@@ -405,7 +408,7 @@ int ITc_i18n_uset_apply_pattern_p(void)
        for (nEnumCounter = 0; nEnumCounter < nEnumSize;  nEnumCounter++)
        {
                nIndex = i18n_uset_apply_pattern(uset, upattern, upattern_length, BitmaskType[nEnumCounter]);
-               CHECK_RETURN_VAL(nIndex, "i18n_uset_is_frozen");
+               CHECK_RETURN_VAL_CLEANUP(nIndex, "i18n_uset_is_frozen",FREE_MEMORY1(upattern));
                
                int nRetVal = get_last_result();
                PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal,"i18n_uset_apply_pattern", BaseUtilsGetError(nRetVal), FREE_MEMORY1(upattern));
@@ -548,15 +551,21 @@ int ITc_i18n_uset_resembles_pattern_p(void)
        if(pRet == NULL || upattern_length <= 0)
        {
                FPRINTF("\\n[Line : %d][%s] i18n_ustring_copy_ua failed in precondition \n", __LINE__, API_NAMESPACE);
+               FREE_MEMORY1(upattern);
                return 1;
        }
 
        //Target Api
     i18n_ubool ubool = i18n_uset_resembles_pattern(upattern, upattern_length, pos);
-       CHECK_VALUE_INT(ubool, "i18n_uset_resembles_pattern");
+       if(ubool == 0)
+       {
+               FPRINTF("\\n[Line : %d][%s] i18n_uset_resembles_pattern return zero  \n", __LINE__, API_NAMESPACE);
+               FREE_MEMORY1(upattern);
+               return 1;
+       }
        
     int nRetVal = get_last_result();
-       PRINT_RESULT(I18N_ERROR_NONE, nRetVal, "i18n_uset_resembles_pattern", BaseUtilsGetError(nRetVal));
+       PRINT_RESULT_CLEANUP(I18N_ERROR_NONE, nRetVal, "i18n_uset_resembles_pattern", BaseUtilsGetError(nRetVal),FREE_MEMORY1(upattern));
        
        FREE_MEMORY1(upattern);
        

diff --git a/src/itc/base-utils/ITs-base-utils-uversion.c b/src/itc/base-utils/ITs-base-utils-uversion.c
index 733b1cc..ccfba06 100755 (executable)
--- a/src/itc/base-utils/ITs-base-utils-uversion.c
+++ b/src/itc/base-utils/ITs-base-utils-uversion.c
@@ -29,7 +29,8 @@ void ITs_base_utils_uversion_startup(void)
        struct stat stBuff;
        if ( stat(ERR_LOG, &stBuff) == 0 )
        {
-               remove(ERR_LOG);
+               int nRet = remove(ERR_LOG);
+               PRINT_RESULT_NORETURN(0, nRet, "ITs_base_utils_uversion_startup -remove", "Remove failed for ERR_LOG");
        }
 #if DEBUG
        FPRINTF("[Line : %d][%s] TEST SUIT start-up: ITs_base_utils_uversion\\n", __LINE__, API_NAMESPACE);

diff --git a/src/itc/contacts-service2/ITs-contacts-service2-database.c b/src/itc/contacts-service2/ITs-contacts-service2-database.c
index ca60455..70bfcda 100755 (executable)
--- a/src/itc/contacts-service2/ITs-contacts-service2-database.c
+++ b/src/itc/contacts-service2/ITs-contacts-service2-database.c
@@ -77,9 +77,6 @@ static void ContactsDbStatusChangedCB(contacts_db_status_e status, void* user_da
                FPRINTF("[Line : %d][%s] Db status: CONTACTS_DB_STATUS_CHANGING_COLLATION\\n", __LINE__, API_NAMESPACE);
                g_bCallbackReturnValue = true;
                break;
-       default:
-               g_bCallbackReturnValue = false;
-               break;
        }
        if ( g_pContactsServiceMainLoop )
        {

diff --git a/src/itc/data-control/ITs-data-control-provider.c b/src/itc/data-control/ITs-data-control-provider.c
index da2615a..ea1ee9c 100755 (executable)
--- a/src/itc/data-control/ITs-data-control-provider.c
+++ b/src/itc/data-control/ITs-data-control-provider.c
@@ -599,19 +599,22 @@ int ITc_data_control_provider_foreach_data_change_consumer_p(void)
        sql_callback->update_cb = UpdateRequestCB;
        
        nRet = data_control_provider_sql_register_cb(sql_callback, NULL);
-       PRINT_RESULT_CLEANUP(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_sql_register_cb", DataControlGetError(nRet),data_control_sql_destroy(hProvider));
+       PRINT_RESULT_CLEANUP(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_sql_register_cb", DataControlGetError(nRet),data_control_sql_destroy(hProvider);FREE_MEMORY(sql_callback));
        
        nRet = data_control_provider_foreach_data_change_consumer(hProvider, &ChangeNotiConsumerListCB, NULL);
-       PRINT_RESULT_CLEANUP(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_foreach_data_change_consumer", DataControlGetError(nRet),data_control_sql_destroy(hProvider));
+       PRINT_RESULT_CLEANUP(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_foreach_data_change_consumer", DataControlGetError(nRet),data_control_sql_destroy(hProvider);FREE_MEMORY(sql_callback));
        /*
        * Callback hit for ChangeNotiConsumerListCB can't be checked as discussed with developer
        * Because to check callback hit, it needs consumer app. Not in TCT scope
        */
-       
+
        nRet = data_control_provider_sql_unregister_cb();
-       PRINT_RESULT_NORETURN(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_sql_unregister_cb", DataControlGetError(nRet));
+       PRINT_RESULT_CLEANUP(DATA_CONTROL_ERROR_NONE, nRet, "data_control_provider_sql_unregister_cb", DataControlGetError(nRet),FREE_MEMORY(sql_callback));
+       
+       FREE_MEMORY(sql_callback);
        
-       data_control_sql_destroy(hProvider);
+       nRet = data_control_sql_destroy(hProvider);
+       PRINT_RESULT_NORETURN(DATA_CONTROL_ERROR_NONE, nRet, "data_control_sql_destroy", DataControlGetError(nRet));
        
        return 0;
 }

diff --git a/src/itc/telephony/ITs-telephony-common.c b/src/itc/telephony/ITs-telephony-common.c
index ea90fef..e7b4d08 100755 (executable)
--- a/src/itc/telephony/ITs-telephony-common.c
+++ b/src/itc/telephony/ITs-telephony-common.c
@@ -141,7 +141,7 @@ char *TelephonyGetSimState(telephony_sim_state_e eRet)
 */
 char *TelephonyGetSimLockState(telephony_sim_lock_state_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Lock State";
        switch ( eRet )
        {
        case TELEPHONY_SIM_LOCK_STATE_UNKNOWN:                  szErrorVal = "TELEPHONY_SIM_LOCK_STATE_UNKNOWN";                        break;
@@ -149,7 +149,6 @@ char *TelephonyGetSimLockState(telephony_sim_lock_state_e eRet)
        case TELEPHONY_SIM_LOCK_STATE_PUK_REQUIRED:                             szErrorVal = "TELEPHONY_SIM_LOCK_STATE_PUK_REQUIRED";                   break;
        case TELEPHONY_SIM_LOCK_STATE_PERM_LOCKED:                              szErrorVal = "TELEPHONY_SIM_LOCK_STATE_PERM_LOCKED";                            break;
        case TELEPHONY_SIM_LOCK_STATE_NCK_REQUIRED:                             szErrorVal = "TELEPHONY_SIM_LOCK_STATE_NCK_REQUIRED";                           break;
-       default:                                                                                szErrorVal = "Unknown Lock State";                                                      break;
        }
        return szErrorVal;
 }
@@ -162,7 +161,7 @@ char *TelephonyGetSimLockState(telephony_sim_lock_state_e eRet)
 */
 char *TelephonyGetRSSIValue(telephony_network_rssi_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Value";
        switch ( eRet )
        {
        case TELEPHONY_NETWORK_RSSI_0:                          szErrorVal = "TELEPHONY_NETWORK_RSSI_0";                                break;
@@ -172,7 +171,6 @@ char *TelephonyGetRSSIValue(telephony_network_rssi_e eRet)
        case TELEPHONY_NETWORK_RSSI_4:                          szErrorVal = "TELEPHONY_NETWORK_RSSI_4";                                break;
        case TELEPHONY_NETWORK_RSSI_5:                          szErrorVal = "TELEPHONY_NETWORK_RSSI_5";                                break;
        case TELEPHONY_NETWORK_RSSI_6:                          szErrorVal = "TELEPHONY_NETWORK_RSSI_6";                                break;
-       default:                                                                        szErrorVal = "Unknown Value";                                                   break;
        }
        return szErrorVal;
 }
@@ -185,7 +183,7 @@ char *TelephonyGetRSSIValue(telephony_network_rssi_e eRet)
 */
 char *TelephonyGetNetworkType(telephony_network_type_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        case TELEPHONY_NETWORK_TYPE_UNKNOWN:                    szErrorVal = "TELEPHONY_NETWORK_TYPE_UNKNOWN";                  break;
@@ -203,7 +201,6 @@ char *TelephonyGetNetworkType(telephony_network_type_e eRet)
     case TELEPHONY_NETWORK_TYPE_EVDO_REV_B:            szErrorVal = "TELEPHONY_NETWORK_TYPE_EVDO_REV_B";               break;/**< EVDO revision B network type (Since: 3.0) */
     case TELEPHONY_NETWORK_TYPE_EVDV:                          szErrorVal = "TELEPHONY_NETWORK_TYPE_EVDV";                             break;/**< EVDV network type (Since: 3.0) */
     case TELEPHONY_NETWORK_TYPE_EHRPD:                         szErrorVal = "TELEPHONY_NETWORK_TYPE_EHRPD";                    break; /**< EHRPD network type (Since: 3.0) */
-       default:                                                                                szErrorVal = "Unknown Type";                                                    break;
        }
        return szErrorVal;
 }
@@ -216,13 +213,12 @@ char *TelephonyGetNetworkType(telephony_network_type_e eRet)
 */
 char *TelephonyGetNetworkSelMode(telephony_network_selection_mode_e eRet)
 {
-       char *szErrorVal = NULL;
+       char *szErrorVal = "Unknown Type";
        switch ( eRet )
        {
        
        case TELEPHONY_NETWORK_SELECTION_MODE_AUTOMATIC:        szErrorVal = "TELEPHONY_NETWORK_SELECTION_MODE_AUTOMATIC";              break;   /**< Automatic mode */
     case TELEPHONY_NETWORK_SELECTION_MODE_MANUAL:      szErrorVal = "TELEPHONY_NETWORK_SELECTION_MODE_MANUAL";                 break;    /**< Manual mode */
-       default:                                                                                        szErrorVal = "Unknown Type";                                                                    break;
        }
        return szErrorVal;
 }

diff --git a/src/itc/wifi-direct/ITs-wifi-direct-common.c b/src/itc/wifi-direct/ITs-wifi-direct-common.c
index 25362a4..added35 100755 (executable)
--- a/src/itc/wifi-direct/ITs-wifi-direct-common.c
+++ b/src/itc/wifi-direct/ITs-wifi-direct-common.c
@@ -297,7 +297,7 @@ bool WifiDirectTerminateService()
 */
 char* WifiDirectGetVSIEFrameID(wifi_direct_vsie_frames_e nFrameId)
 {
-       char *szFrameId = NULL;
+       char *szFrameId = "Unknown Frame ID";
        switch ( nFrameId )
        {
        case WIFI_DIRECT_VSIE_FRAME_P2P_PROBE_REQ:      szFrameId = "WIFI_DIRECT_VSIE_FRAME_P2P_PROBE_REQ";             break;
@@ -314,7 +314,6 @@ char* WifiDirectGetVSIEFrameID(wifi_direct_vsie_frames_e nFrameId)
        case WIFI_DIRECT_VSIE_FRAME_P2P_ASSOC_REQ:      szFrameId = "WIFI_DIRECT_VSIE_FRAME_P2P_ASSOC_REQ";             break;
        case WIFI_DIRECT_VSIE_FRAME_P2P_ASSOC_RESP:     szFrameId = "WIFI_DIRECT_VSIE_FRAME_P2P_ASSOC_RESP";            break;
        case WIFI_DIRECT_VSIE_FRAME_ASSOC_REQ:          szFrameId = "WIFI_DIRECT_VSIE_FRAME_ASSOC_REQ";                 break;
-       default :                                       szFrameId = "Unknown Frame ID";                                 break;
        }
        return szFrameId;
 }