From 3c836f9161978e701fad78779c0339459ad27a8b Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Mon, 10 Apr 2017 10:31:58 +0530 Subject: [PATCH] Fixed static analysis errors from cppcheck. wifi-direct$ cppcheck --enable=all --force ./ | grep error [src/wifi-direct-client-proxy.c:1160] -> [src/wifi-direct-client-proxy.c:1164]: (performance) Variable 'ret' is reassigned a value before the old one has been used. [src/wifi-direct-client-proxy.c:2425]: (style) Variable 'result' is assigned a value that is never used. [test/test-wifi-direct.c:892] -> [test/test-wifi-direct.c:878]: (warning) Possible null pointer dereference: ad - otherwise it is redundant to check it against null. [test/test-wifi-direct.c:893] -> [test/test-wifi-direct.c:878]: (warning) Possible null pointer dereference: ad - otherwise it is redundant to check it against null. [test/test-wifi-direct.c:2514]: (warning) Array index -1 is out of bounds. Otherwise there is useless condition at line 2515. [test/test-wifi-direct.c:2464]: (portability) scanf without field width limits can crash with huge input data on some versions of libc. [test/test-wifi-direct.c:891]: (error) Uninitialized variable: result [src/wifi-direct-client-proxy.c:682]: (style) The function '__wfd_client_print_connected_peer_info' is never used. [src/wifi-direct-client-proxy.c:665]: (style) The function '__wfd_client_print_entry_list' is never used. [src/wifi-direct-client-proxy.c:698]: (style) The function '__wfd_client_print_persistent_group_info' is never used. [test/test-wifi-direct.c:304]: (style) The function 'get_appdata' is never used. [test/test-wifi-direct.c:341]: (style) The function 'usage' is never used. [src/wifi-direct-dbus.c:151]: (style) The function 'wifi_direct_dbus_method_call_sync_debug' is never used. [src/wifi-direct-client-proxy.c:1110]: (style) The function 'wifi_direct_unset_client_ip_address_assigned_cb' is never used. (information) Cppcheck cannot find all the include files (use --check-config for details) Change-Id: Ic9931366bb562a0f73d29ce24f67a65bfdd499eb Signed-off-by: Nishant Chaprana --- src/wifi-direct-client-proxy.c | 6 ++-- test/test-wifi-direct.c | 67 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/wifi-direct-client-proxy.c b/src/wifi-direct-client-proxy.c index 3238993..0a46cc0 100644 --- a/src/wifi-direct-client-proxy.c +++ b/src/wifi-direct-client-proxy.c @@ -662,6 +662,7 @@ void wifi_direct_process_service_discovery_finished(GDBusConnection *connection, } #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */ +#if 0 void __wfd_client_print_entry_list(wfd_discovery_entry_s *list, int num) { int i = 0; @@ -707,6 +708,7 @@ void __wfd_client_print_persistent_group_info(wfd_persistent_group_info_s *list, } WDC_LOGD("------------------------------------------\n"); } +#endif //LCOV_EXCL_STOP int wifi_direct_initialize(void) @@ -1157,7 +1159,7 @@ int wifi_direct_set_state_changed_cb(wifi_direct_state_changed_cb cb, void *user int wifi_direct_unset_state_changed_cb(void) { __WDC_LOG_FUNC_START__; - int ret = WIFI_DIRECT_ERROR_NONE; + int ret; CHECK_FEATURE_SUPPORTED(WIFIDIRECT_FEATURE); @@ -2422,7 +2424,7 @@ int wifi_direct_foreach_supported_wps_types(wifi_direct_supported_wps_type_cb cb if ((result == TRUE) && (wps_mode & WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY)) result = cb(WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY, user_data); if ((result == TRUE) && (wps_mode & WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD)) - result = cb(WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD, user_data); + cb(WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD, user_data); WDC_LOGD("%s() return : [%d]", __func__, ret); __WDC_LOG_FUNC_END__; diff --git a/test/test-wifi-direct.c b/test/test-wifi-direct.c index 1320e47..d7ae819 100644 --- a/test/test-wifi-direct.c +++ b/test/test-wifi-direct.c @@ -125,6 +125,7 @@ enum { CMD_SET_DISCOVER_CB, CMD_SET_SERVICE_CB, CMD_SET_CONNECTION_CB, + CMD_SET_IP_ADDR_ASSIGNED_CB, CMD_SET_PEER_FOUND_CB, CMD_SET_DEVICE_NAME_CB, CMD_SET_STATE_CB, @@ -132,6 +133,7 @@ enum { CMD_UNSET_DISCOVER_CB, CMD_UNSET_SERVICE_CB, CMD_UNSET_CONNECTION_CB, + CMD_UNSET_IP_ADDR_ASSIGNED_CB, CMD_UNSET_PEER_FOUND_CB, CMD_UNSET_DEVICE_NAME_CB, CMD_UNSET_STATE_CB, @@ -239,12 +241,14 @@ menu_str_t g_menu_str[] = { { CMD_SET_ACTIVATION_CB, "CMD_SET_ACTIVATION_CB" }, { CMD_SET_DISCOVER_CB, "CMD_SET_DISCOVER_CB" }, { CMD_SET_CONNECTION_CB, "CMD_SET_CONNECTION_CB" }, + { CMD_SET_IP_ADDR_ASSIGNED_CB, "CMD_SET_IP_ADDR_ASSIGNED_CB" }, { CMD_SET_PEER_FOUND_CB, "CMD_SET_PEER_FOUND_CB" }, { CMD_SET_DEVICE_NAME_CB, "CMD_SET_DEVICE_NAME_CB"}, { CMD_SET_STATE_CB, "CMD_SET_STATE_CB"}, { CMD_UNSET_ACTIVATION_CB, "CMD_UNSET_ACTIVATION_CB" }, { CMD_UNSET_DISCOVER_CB, "CMD_UNSET_DISCOVER_CB" }, { CMD_UNSET_CONNECTION_CB, "CMD_UNSET_CONNECTION_CB" }, + { CMD_UNSET_IP_ADDR_ASSIGNED_CB, "CMD_UNSET_IP_ADDR_ASSIGNED_CB" }, { CMD_UNSET_PEER_FOUND_CB, "CMD_UNSET_PEER_FOUND_CB" }, { CMD_UNSET_STATE_CB, "CMD_UNSET_STATE_CB" }, { CMD_GET_NETWORK_IF_NAME, "CMD_GET_NETWORK_IF_NAME" }, @@ -301,11 +305,6 @@ struct appdata { struct appdata* g_test_appdata; -struct appdata* get_appdata() -{ - return g_test_appdata; -} - void set_appdata(struct appdata* p) { g_test_appdata = p; @@ -338,15 +337,7 @@ static int get_param(int argc, char **argv, struct appdata *ad) return 0; } -void usage() -{ - printf("Call Test Program\n"); - printf(" %d: quit\n", CMD_QUIT); - printf(" %d: Full menu\n", CMD_FULL_MENU); -} - -char* -cmd_transform(char*str) +char* cmd_transform(char*str) { int i, j; int len; @@ -846,9 +837,8 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st event_printf("event - WIFI_DIRECT_CONNECTION_WPS_REQ\n"); wifi_direct_wps_type_e wps_mode; - int result; - result = wifi_direct_get_local_wps_type(&wps_mode); + int result = wifi_direct_get_local_wps_type(&wps_mode); printf("wifi_direct_get_local_wps_type() result=[%d]\n", result); /* BCMP2P_DISCOVER_ENTRY notification_data; */ @@ -871,34 +861,32 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st } else if (wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD) { printf("wps_config is WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD\n"); char pin[9] = { 0, }; - int result; - + int l_result = WIFI_DIRECT_ERROR_NONE; struct appdata *ad = (struct appdata *) user_data; - if (NULL == ad) - printf("ERROR : ad is NULL!!!\n"); - memset(pin, 0x00, sizeof(pin)); printf("Input 8 digit PIN number :\n"); if (scanf(" %8s", pin) < 1) break; - if (strlen(pin) > 0) - result = wifi_direct_set_wps_pin(pin); - else - printf("Invalid PIN number\n"); + l_result = wifi_direct_set_wps_pin(pin); + if (l_result == WIFI_DIRECT_ERROR_NONE) { + int i; - if (result == WIFI_DIRECT_ERROR_NONE) { - int i = ad->selected_peer_index; + if (NULL == ad) { + printf("ERROR : ad is NULL!!!\n"); + break; + } + + i = ad->selected_peer_index; wifi_direct_discovered_peer_info_s* list = ad->peer_list; - result = wifi_direct_accept_connection(list[i].mac_address); - printf("wifi_direct_accept_connection() result=[%d]\n", result); + l_result = wifi_direct_accept_connection(list[i].mac_address); + printf("wifi_direct_accept_connection() result=[%d]\n", l_result); } else - printf("wifi_direct_set_wps_pin Error [%d]\n", result); + printf("wifi_direct_set_wps_pin Error [%d]\n", l_result); } else printf("wps_config is unknown!\n"); - } break; @@ -1201,6 +1189,20 @@ void process_input(const char *input, gpointer user_data) } break; + case CMD_SET_IP_ADDR_ASSIGNED_CB: + { + result = wifi_direct_set_client_ip_address_assigned_cb(_cb_ip_assigned, (void*)ad); + printf("wifi_direct_set_client_ip_address_assigned_cb() result=[%d]\n", result); + } + break; + + case CMD_UNSET_IP_ADDR_ASSIGNED_CB: + { + result = wifi_direct_unset_client_ip_address_assigned_cb(); + printf("wifi_direct_unset_client_ip_address_assigned_cb() result=[%d]\n", result); + } + break; + case CMD_SET_SERVICE_CB: { result = wifi_direct_set_service_state_changed_cb(_cb_service, (void*)ad); @@ -2462,7 +2464,7 @@ void process_input(const char *input, gpointer user_data) case CMD_SET_AUTO_GROUP_REMOVAL: if (ad != NULL) { int enable; - if (scanf(" %d", &enable) < 1) + if (scanf(" %1d", &enable) < 1) break; result = wifi_direct_set_auto_group_removal(enable); @@ -2511,7 +2513,6 @@ static gboolean test_terminal_read_std_input(GIOChannel * source, errno = 0; n = read(fd, buf, 1024); - if (n == 0) { printf("Error: read() from stdin returns 0.\n"); } else if (n < 0) { -- 2.7.4