Fix coding guidelines issues

Change-Id: Ia4c414ed860173b2ff9ce0d662344520635f1478
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/include/wifi-manager.h b/include/wifi-manager.h
index 9611363..ed6159a 100644 (file)
--- a/include/wifi-manager.h
+++ b/include/wifi-manager.h
@@ -1387,7 +1387,7 @@ int wifi_manager_specific_scan_destroy(wifi_manager_h wifi, wifi_manager_specifi
  * @privilege %http://tizen.org/privilege/network.get
  * @param[in] wifi             The Wi-Fi handle
  * @param[out] max_scan_ssids  The maximum number of SSIDs supported by the Wi-Fi \n
- *                             chipset for the scan operation.
+ *                              chipset for the scan operation.
  * @return 0 on success, otherwise negative error value
  * @retval #WIFI_MANAGER_ERROR_NONE                 Successful
  * @retval #WIFI_MANAGER_ERROR_NOT_INITIALIZED      Not initialized

diff --git a/src/network_dbus.c b/src/network_dbus.c
index 82a4079..fcb3c4d 100644 (file)
--- a/src/network_dbus.c
+++ b/src/network_dbus.c
@@ -2713,7 +2713,7 @@ int _net_dbus_dpp_generate_uri(network_info_s *network_info,
 
        g_variant_builder_add(builder, "{sv}", "peer_id", g_variant_new_uint32(peer_id));
        g_variant_builder_add(builder, "{sv}", "own_id", g_variant_new_uint32(own_id));
-       g_variant_builder_add(builder, "{sv}", "is_initiator", g_variant_new_boolean (is_initiator));
+       g_variant_builder_add(builder, "{sv}", "is_initiator", g_variant_new_boolean(is_initiator));
        if (key)
                g_variant_builder_add(builder, "{sv}", "key", g_variant_new_string(key));
 
@@ -2907,7 +2907,7 @@ int _net_dbus_dpp_stop(network_info_s *network_info,
 
        g_variant_builder_add(builder, "{sv}", "peer_id", g_variant_new_uint32(peer_id));
        g_variant_builder_add(builder, "{sv}", "own_id", g_variant_new_uint32(own_id));
-       g_variant_builder_add(builder, "{sv}", "is_initiator", g_variant_new_boolean (is_initiator));
+       g_variant_builder_add(builder, "{sv}", "is_initiator", g_variant_new_boolean(is_initiator));
 
        params = g_variant_new("(@a{sv})", g_variant_builder_end(builder));
        g_variant_builder_unref(builder);

diff --git a/src/network_interface.c b/src/network_interface.c
index 4e46898..02452b9 100644 (file)
--- a/src/network_interface.c
+++ b/src/network_interface.c
@@ -2460,23 +2460,21 @@ wifi_tech_state_e net_get_technology_state(network_info_s *network_info)
                                gboolean find = FALSE;
 
                                g_variant_get(variant, "a{sv}", &list_iter);
-                               while(g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
+                               while (g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
                                        if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_STRING)) {
                                                sdata = g_variant_get_string(dev_var, NULL);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, sdata);
 
-                                               if (g_strcmp0(dev_key, "Ifname") == 0) {
+                                               if (g_strcmp0(dev_key, "Ifname") == 0)
                                                        find = g_strcmp0(sdata, network_info->interface_name) == 0 ? TRUE : FALSE;
-                                               }
                                        } else if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_BOOLEAN)) {
                                                bdata = g_variant_get_boolean(dev_var);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, bdata ? "True" : "False");
 
-                                               if (find && g_strcmp0(dev_key, "Powered") == 0) {
+                                               if (find && g_strcmp0(dev_key, "Powered") == 0)
                                                        wifi_tech_powered = bdata;
-                                               } else if (find && g_strcmp0(dev_key, "Connected") == 0) {
+                                               else if (find && g_strcmp0(dev_key, "Connected") == 0)
                                                        wifi_tech_connected = bdata;
-                                               }
                                        }
                                }
                                g_variant_iter_free(list_iter);
@@ -3690,7 +3688,7 @@ int net_wifi_get_module_state(network_info_s *network_info, int *module_state)
                                const gchar *sdata = NULL;
 
                                g_variant_get(variant, "a{sv}", &list_iter);
-                               while(g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
+                               while (g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
                                        if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_STRING)) {
                                                sdata = g_variant_get_string(dev_var, NULL);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, sdata);

diff --git a/src/network_internal.c b/src/network_internal.c
index b801b12..dc1ff9a 100644 (file)
--- a/src/network_internal.c
+++ b/src/network_internal.c
@@ -193,23 +193,21 @@ int _net_get_tech_state(network_info_s *network_info,
                                gboolean find = FALSE;
 
                                g_variant_get(value, "a{sv}", &list_iter);
-                               while(g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
+                               while (g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
                                        if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_STRING)) {
                                                sdata = g_variant_get_string(dev_var, NULL);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, sdata);
 
-                                               if (g_strcmp0(dev_key, "Ifname") == 0) {
+                                               if (g_strcmp0(dev_key, "Ifname") == 0)
                                                        find = g_strcmp0(sdata, network_info->interface_name) == 0 ? TRUE : FALSE;
-                                               }
                                        } else if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_BOOLEAN)) {
                                                bdata = g_variant_get_boolean(dev_var);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, bdata ? "True" : "False");
 
-                                               if (find && g_strcmp0(dev_key, "Powered") == 0) {
+                                               if (find && g_strcmp0(dev_key, "Powered") == 0)
                                                        tech_state->Powered = bdata;
-                                               } else if (find && g_strcmp0(dev_key, "Connected") == 0) {
+                                               else if (find && g_strcmp0(dev_key, "Connected") == 0)
                                                        tech_state->Connected = bdata;
-                                               }
                                        }
                                }
                                g_variant_iter_free(list_iter);

diff --git a/src/network_signal.c b/src/network_signal.c
index 135485e..1a9b40f 100644 (file)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -1922,16 +1922,15 @@ static int __net_get_tech_states(network_info_s *network_info, GVariant *message
                                gboolean find = FALSE;
 
                                g_variant_get(variant, "a{sv}", &list_iter);
-                               while(g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
+                               while (g_variant_iter_loop(list_iter, "{sv}", &dev_key, &dev_var)) {
                                        if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_STRING)) {
                                                sdata = g_variant_get_string(dev_var, NULL);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, sdata);
 
-                                               if (g_strcmp0(dev_key, "Ifname") == 0) {
+                                               if (g_strcmp0(dev_key, "Ifname") == 0)
                                                        find = g_strcmp0(sdata, network_info->interface_name) == 0 ? TRUE : FALSE;
-                                               } else if (find && g_strcmp0(dev_key, "MAC.Address") == 0) {
+                                               else if (find && g_strcmp0(dev_key, "MAC.Address") == 0)
                                                        g_strlcpy(network_info->mac_address, sdata, WIFI_MAC_ADDR_LEN + 1);
-                                               }
                                        } else if (g_variant_is_of_type(dev_var, G_VARIANT_TYPE_BOOLEAN)) {
                                                bdata = g_variant_get_boolean(dev_var);
                                                WIFI_LOG(WIFI_INFO, "%s [%s]", dev_key, bdata ? "True" : "False");

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 5fdfe3a..689afe1 100644 (file)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -3890,7 +3890,7 @@ int _wifi_dpp_enter_peer_uri(wifi_dpp_s *p_dpp,
        if (!__is_peer_scan_requested_responder(p_dpp))
                return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 
-       if(g_p_dpp_current != p_dpp)
+       if (g_p_dpp_current != p_dpp)
                return WIFI_MANAGER_ERROR_NOW_IN_PROGRESS;
 
        rv = net_dpp_enter_peer_uri(p_dpp->network_info, p_dpp->peer_id, p_dpp->own_id, uri);
@@ -3910,7 +3910,7 @@ int _wifi_dpp_request_own_uri_gen(wifi_dpp_s *p_dpp, const char *key)
        if (!__is_response_pending_initiator(p_dpp))
                return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 
-       if(g_p_dpp_current != p_dpp)
+       if (g_p_dpp_current != p_dpp)
                return WIFI_MANAGER_ERROR_NOW_IN_PROGRESS;
 
        rv = net_dpp_generate_own_uri(p_dpp->network_info,
@@ -3931,7 +3931,7 @@ int _wifi_dpp_start(wifi_dpp_s *p_dpp, const char *auth_key,
                        !__is_new_responder(p_dpp))
                return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 
-       if(g_p_dpp_current)
+       if (g_p_dpp_current)
                return WIFI_MANAGER_ERROR_NOW_IN_PROGRESS;
 
        rv = net_dpp_start((void *)p_dpp, auth_key, configurator_key, pass);
@@ -3955,7 +3955,7 @@ int _wifi_dpp_stop(wifi_dpp_s *p_dpp)
        if (!g_p_dpp_current)
                return WIFI_MANAGER_ERROR_INVALID_OPERATION;
 
-       if(g_p_dpp_current != p_dpp)
+       if (g_p_dpp_current != p_dpp)
                return WIFI_MANAGER_ERROR_NOW_IN_PROGRESS;
 
        rv = net_dpp_stop(p_dpp->network_info,

diff --git a/src/wifi_internal.h b/src/wifi_internal.h
index 73216d7..fd658d2 100644 (file)
--- a/src/wifi_internal.h
+++ b/src/wifi_internal.h
@@ -85,12 +85,12 @@ typedef enum {
 #define WIFI_LOCK \
        do { \
                _wifi_lock(); \
-       } while(0)
+       } while (0)
 
 #define WIFI_UNLOCK \
        do { \
                _wifi_unlock(); \
-       } while(0)
+       } while (0)
 
 #define CHECK_FEATURE_SUPPORTED(...) \
        do { \
@@ -113,19 +113,19 @@ typedef enum {
                } \
        } while (0)
 
-#define RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(arg, release)\
-       do {\
-               if (!arg) {\
-                       WIFI_LOG(WIFI_ERROR, "Wifi handle is null");\
-                       release;\
-                       return WIFI_MANAGER_ERROR_INVALID_PARAMETER;\
-               }\
-               if (!__wifi_check_handle_validity(arg)) {\
-                       WIFI_LOG(WIFI_ERROR, "Wifi handle is not initialized");\
-                       release;\
-                       return WIFI_MANAGER_ERROR_NOT_INITIALIZED;\
-               }\
-       } while(0)
+#define RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(arg, release) \
+       do { \
+               if (!arg) { \
+                       WIFI_LOG(WIFI_ERROR, "Wifi handle is null"); \
+                       release; \
+                       return WIFI_MANAGER_ERROR_INVALID_PARAMETER; \
+               } \
+               if (!__wifi_check_handle_validity(arg)) { \
+                       WIFI_LOG(WIFI_ERROR, "Wifi handle is not initialized"); \
+                       release; \
+                       return WIFI_MANAGER_ERROR_NOT_INITIALIZED; \
+               } \
+       } while (0)
 
 typedef void *wifi_manager_dpp_h;
 

diff --git a/tests/mocks/mock_gdbus.c b/tests/mocks/mock_gdbus.c
index a84772f..65d0547 100644 (file)
--- a/tests/mocks/mock_gdbus.c
+++ b/tests/mocks/mock_gdbus.c
@@ -54,8 +54,8 @@ static const char *gdbus_signal_list[WIFI_MOCK_GDBUS_SIGNAL_MAX] = {
 };
 
 static gdbus_signal_callback_info_s gdbus_signal_callbacks[WIFI_MOCK_GDBUS_SIGNAL_MAX] = {
-        {NULL, NULL}, {NULL, NULL}, {NULL, NULL}, {NULL, NULL} }; // {NULL, NULL},
- //       {NULL, NULL}, {NULL, NULL}, {NULL, NULL}, {NULL, NULL} };
+       {NULL, NULL}, {NULL, NULL}, {NULL, NULL}, {NULL, NULL} }; // {NULL, NULL},
+//     {NULL, NULL}, {NULL, NULL}, {NULL, NULL}, {NULL, NULL} };
 
 #endif
 static gdbus_async_callback_info_s gdbus_async_callback = {NULL, NULL};
@@ -408,55 +408,55 @@ void mock_invoke_gdbus_async_callback(void)
 #if 0
 void mock_emit_gdbus_signal(int signo)
 {
-        if (signo < WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES|| signo >= WIFI_MOCK_GDBUS_SIGNAL_MAX)
-                return;
+       if (signo < WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES || signo >= WIFI_MOCK_GDBUS_SIGNAL_MAX)
+               return;
 
-        if (!gdbus_signal_callbacks[signo].callback)
-                return;
+       if (!gdbus_signal_callbacks[signo].callback)
+               return;
 
        GVariant *params = NULL;
        return;
-        switch (signo) {
-        case TETHERING_MOCK_GDBUS_SIGNAL_NET_CLOSED:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_WIFI_TETHER_ON:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_WIFI_TETHER_OFF:
-                params = g_variant_new("(s)", "There is no connection for a while");
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_USB_TETHER_ON:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_USB_TETHER_OFF:
-                params = g_variant_new("(s)", "Interface is not available");
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_BT_TETHER_ON:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_BT_TETHER_OFF:
-                params = g_variant_new("(s)", "There is no connection for a while");
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_NO_DATA_TIMEOUT:
-        case TETHERING_MOCK_GDBUS_SIGNAL_LOW_BATTERY_MODE:
-        case TETHERING_MOCK_GDBUS_SIGNAL_FLIGHT_MODE:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_SECURITY_TYPE_CHANGED:
-                params = g_variant_new("(s)", "wpa2-psk");
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_SSID_VISIBILITY_CHANGED:
-                params = g_variant_new("(s)", "ssid_visible");
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_PASSPHRASE_CHANGED:
-                break;
-        case TETHERING_MOCK_GDBUS_SIGNAL_DHCP_STATUS:
-                params = g_variant_new("(susssu)", "DhcpConnected", 1,
-                                "192.168.43.24", "ab:cd:ef:ab:cd:ef",
-                                "client", 1592460260);
-                break;
-        default:
-                break;
-        }
+       switch (signo) {
+       case TETHERING_MOCK_GDBUS_SIGNAL_NET_CLOSED:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_WIFI_TETHER_ON:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_WIFI_TETHER_OFF:
+               params = g_variant_new("(s)", "There is no connection for a while");
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_USB_TETHER_ON:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_USB_TETHER_OFF:
+               params = g_variant_new("(s)", "Interface is not available");
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_BT_TETHER_ON:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_BT_TETHER_OFF:
+               params = g_variant_new("(s)", "There is no connection for a while");
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_NO_DATA_TIMEOUT:
+       case TETHERING_MOCK_GDBUS_SIGNAL_LOW_BATTERY_MODE:
+       case TETHERING_MOCK_GDBUS_SIGNAL_FLIGHT_MODE:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_SECURITY_TYPE_CHANGED:
+               params = g_variant_new("(s)", "wpa2-psk");
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_SSID_VISIBILITY_CHANGED:
+               params = g_variant_new("(s)", "ssid_visible");
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_PASSPHRASE_CHANGED:
+               break;
+       case TETHERING_MOCK_GDBUS_SIGNAL_DHCP_STATUS:
+               params = g_variant_new("(susssu)", "DhcpConnected", 1,
+                               "192.168.43.24", "ab:cd:ef:ab:cd:ef",
+                               "client", 1592460260);
+               break;
+       default:
+               break;
+       }
        gdbus_signal_callbacks[signo].callback(NULL, NULL,
-                        NULL, NULL, gdbus_signal_list[signo],
-                        params, gdbus_signal_callbacks[signo].user_data);
+                       NULL, NULL, gdbus_signal_list[signo],
+                       params, gdbus_signal_callbacks[signo].user_data);
 }
 #endif
 
@@ -476,31 +476,31 @@ guint __wrap_g_dbus_connection_signal_subscribe(GDBusConnection  *connection,
 
        return 1;
 #if 0
-       if(!member)
+       if (!member)
                return 0;
-        for (int i = WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES; i < WIFI_MOCK_GDBUS_SIGNAL_MAX; i++) {
-                if (strcmp(gdbus_signal_list[i], member) == 0) {
-                        gdbus_signal_callbacks[i].callback = callback;
-                        gdbus_signal_callbacks[i].user_data = user_data;
-                        return i;
-                }
-        }
-        return 0;
+       for (int i = WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES; i < WIFI_MOCK_GDBUS_SIGNAL_MAX; i++) {
+               if (strcmp(gdbus_signal_list[i], member) == 0) {
+                       gdbus_signal_callbacks[i].callback = callback;
+                       gdbus_signal_callbacks[i].user_data = user_data;
+                       return i;
+               }
+       }
+       return 0;
 #endif
 }
 
 void __wrap_g_dbus_connection_signal_unsubscribe(GDBusConnection *connection,
-                guint subscription_id)
+               guint subscription_id)
 {
        if (mock_gdbus_result == false)
                return;
 #if 0
-        if (subscription_id >= WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES
-                        && subscription_id < WIFI_MOCK_GDBUS_SIGNAL_MAX) {
-                gdbus_signal_callbacks[subscription_id].callback = NULL;
-                gdbus_signal_callbacks[subscription_id].user_data = NULL;
-        }
+       if (subscription_id >= WIFI_MOCK_GDBUS_SIGNAL_STATE_CHANGED_PROPERTIES
+                       && subscription_id < WIFI_MOCK_GDBUS_SIGNAL_MAX) {
+               gdbus_signal_callbacks[subscription_id].callback = NULL;
+               gdbus_signal_callbacks[subscription_id].user_data = NULL;
+       }
 
-        return;
+       return;
 #endif
 }

diff --git a/tools/connection-tool/wifi_connect_tool.c b/tools/connection-tool/wifi_connect_tool.c
index 9841ae3..d5a8c11 100644 (file)
--- a/tools/connection-tool/wifi_connect_tool.c
+++ b/tools/connection-tool/wifi_connect_tool.c
@@ -140,9 +140,8 @@ static const char *__convert_error_to_string(int err)
 static gboolean __timeout_cb(gpointer data)
 {
        GMainLoop *main_loop = (GMainLoop *)data;
-       if (main_loop == NULL) {
+       if (main_loop == NULL)
                PRINT_ERROR("main_loop is NULL\n");
-       }
 
        PRINT_ERROR("Callback Timeout\n");
        g_main_loop_quit(main_loop);
@@ -206,8 +205,7 @@ static bool check_connected_ap()
 
                if (!strcmp(ap_name, g_ssid)) {
                        already_connected = true;
-               }
-               else {
+               } else {
                        ret = wifi_manager_forget_ap_async(g_wifi, ap, __forget_cb, NULL);
                        EXIT_IF_RET_IS_ERROR(ret, "wifi_manager_forget_ap_async");
                        RUN_LOOP;
@@ -337,7 +335,7 @@ static void start()
 
 static const char *convert_state_to_string(wifi_manager_connection_state_e state)
 {
-       switch(state) {
+       switch (state) {
        case WIFI_MANAGER_CONNECTION_STATE_FAILURE:
                return "Failure";
        case WIFI_MANAGER_CONNECTION_STATE_DISCONNECTED:
@@ -379,12 +377,10 @@ static void show_status()
 
                        wifi_manager_ap_destroy(ap);
                        free(ap_name);
-               }
-               else {
+               } else {
                        PRINT_RESULT("%s\n", convert_state_to_string(state));
                }
-       }
-       else {
+       } else {
                PRINT_RESULT("Power off\n");
        }
 }

diff --git a/tools/manager-test/wman_test_ap.c b/tools/manager-test/wman_test_ap.c
index 0d1f031..6bbd41a 100644 (file)
--- a/tools/manager-test/wman_test_ap.c
+++ b/tools/manager-test/wman_test_ap.c
@@ -620,9 +620,8 @@ static inline int __test_found_change_ip_method_cb_ip_static(wifi_manager_ap_h a
                                        break;
                                }
                        }
-                       if (rv != WIFI_MANAGER_ERROR_NONE) {
+                       if (rv != WIFI_MANAGER_ERROR_NONE)
                                return -1;
-                       }
 
                        printf("Input DNS2 address (x: skip, 0: clear) : \n");
                        if (address_type == WIFI_MANAGER_ADDRESS_FAMILY_IPV4)
@@ -644,17 +643,16 @@ static inline int __test_found_change_ip_method_cb_ip_static(wifi_manager_ap_h a
                                        break;
                                }
                        }
-                       if (rv != WIFI_MANAGER_ERROR_NONE) {
+                       if (rv != WIFI_MANAGER_ERROR_NONE)
                                return -1;
-                       }
                }
                break;
        case 1:
                rv = wifi_manager_ap_set_dns_config_type(ap,
                        address_type, WIFI_MANAGER_DNS_CONFIG_TYPE_DYNAMIC);
-               if (rv != WIFI_MANAGER_ERROR_NONE) {
+               if (rv != WIFI_MANAGER_ERROR_NONE)
                        return -1;
-               }
+
                break;
        }
 

diff --git a/tools/manager-test/wman_test_extension.c b/tools/manager-test/wman_test_extension.c
index bd3f4fd..00c5aef 100644 (file)
--- a/tools/manager-test/wman_test_extension.c
+++ b/tools/manager-test/wman_test_extension.c
@@ -137,9 +137,8 @@ int wman_test_set_auto_connect(wifi_manager_h wifi)
 
        rv = wifi_manager_set_auto_connect(wifi, mode);
 
-       if (rv != WIFI_MANAGER_ERROR_NONE) {
+       if (rv != WIFI_MANAGER_ERROR_NONE)
                printf("Fail to set auto connect mode, rv = %d\n", rv);
-       }
 
        printf("Request to set auto connect mode\n");
        return 1;
@@ -555,9 +554,8 @@ int wman_test_set_passpoint_enable(wifi_manager_h wifi)
 
        rv = wifi_manager_set_passpoint(wifi, enable);
 
-       if (rv != WIFI_MANAGER_ERROR_NONE) {
+       if (rv != WIFI_MANAGER_ERROR_NONE)
                printf("Fail to set passpoint, rv = %d\n", rv);
-       }
 
        printf("Request to set passpoint\n");
        return 1;

diff --git a/tools/manager-tool/wifi_mgr_menu.h b/tools/manager-tool/wifi_mgr_menu.h
index b1f6dd2..94f71a4 100644 (file)
--- a/tools/manager-tool/wifi_mgr_menu.h
+++ b/tools/manager-tool/wifi_mgr_menu.h
@@ -40,33 +40,33 @@ __BEGIN_DECLS
 #define LOG_WHITE                      "\e[1;37m"
 
 
-#define msg(fmt,args...)       do { fprintf(stdout, fmt "\n", ##args); \
+#define msg(fmt, args...)      do { fprintf(stdout, fmt "\n", ##args); \
                fflush(stdout); } while (0)
-#define msgn(fmt,args...)      do { fprintf(stdout, fmt, ##args); \
+#define msgn(fmt, args...)     do { fprintf(stdout, fmt, ##args); \
                fflush(stdout); } while (0)
 
 /* Bold (green) */
-#define msgb(fmt,args...)  do { fprintf(stdout, LOG_LIGHTGREEN fmt \
+#define msgb(fmt, args...)  do { fprintf(stdout, LOG_LIGHTGREEN fmt \
                LOG_END "\n", ##args); fflush(stdout); } while (0)
 
 /* Property message */
-#define msgp(fmt,args...) do { fprintf(stdout, LOG_LIGHTMAGENTA fmt \
+#define msgp(fmt, args...) do { fprintf(stdout, LOG_LIGHTMAGENTA fmt \
                LOG_END "\n", ##args); fflush(stdout); } while (0)
 
-#define msgt(n,fmt,args...) do { fprintf(stdout, "\e[%dC" fmt "\n", \
+#define msgt(n, fmt, args...) do { fprintf(stdout, "\e[%dC" fmt "\n", \
                3 + ((n) * 2), ##args); fflush(stdout); } while (0)
 
-#define pmsg(fmt,args...) do { \
-       if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
+#define pmsg(fmt, args...) do { \
+       if (is_pid_show()) fprintf(stdout, "(%5d) ", get_tid()); \
        fprintf(stdout, fmt "\n", ##args); fflush(stdout); } while (0)
 
-#define pmsgb(fmt,args...) do { \
-       if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
+#define pmsgb(fmt, args...) do { \
+       if (is_pid_show()) fprintf(stdout, "(%5d) ", get_tid()); \
        fprintf(stdout, LOG_LIGHTGREEN fmt \
                        LOG_END "\n", ##args); fflush(stdout); } while (0)
 
-#define pmsgt(n,fmt,args...) do { \
-       if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
+#define pmsgt(n, fmt, args...) do { \
+       if (is_pid_show()) fprintf(stdout, "(%5d) ", get_tid()); \
        fprintf(stdout, "\e[%dC" fmt "\n", \
                        3 + ((n) * 2), ##args); fflush(stdout); } while (0)
 
@@ -85,7 +85,7 @@ __BEGIN_DECLS
 #define HR_SINGLE2     " ---------------------------------------" \
                                        "------------------------ "
 
-#define MAX_WIDTH      strlen (HR_SINGLE)
+#define MAX_WIDTH      strlen(HR_SINGLE)
 #define MAX_TITLE      ((MAX_WIDTH) - 10)
 #define POS_MORE       ((MAX_WIDTH) - 3)
 #define RET_SUCCESS 0
@@ -109,10 +109,10 @@ void*     menu_manager_ref_user_data(MManager *mm);
 gboolean  on_menu_manager_keyboard(GIOChannel *src, GIOCondition con,
                gpointer data);
 
-pid_t     get_tid ();
-void      hide_pid ();
-void      show_pid ();
-int       is_pid_show ();
+pid_t     get_tid();
+void      hide_pid();
+void      show_pid();
+int       is_pid_show();
 void      menu_print_dump(int data_len, void *data);
 
 __END_DECLS