Fixed build warnings 33/141333/4
authorSeonah Moon <seonah1.moon@samsung.com>
Mon, 31 Jul 2017 05:03:44 +0000 (14:03 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Wed, 2 Aug 2017 07:54:02 +0000 (16:54 +0900)
Change-Id: I3f9caf5fc72408b1c8313763925eec6fe3ade285

CMakeLists.txt
packaging/mobileap-agent.spec
src/mobileap_handler.c
src/mobileap_wifi.c

index 2b8a318..bf4cd35 100755 (executable)
@@ -51,7 +51,7 @@ SET(SRCS ${BASE_SRCS}
        src/mobileap_wfd.c
 )
 SET(PKGS "${BASE_PKGS} ${HEADED_PKGS} capi-network-wifi-direct")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "HEADEDN")
+ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "HEADED")
 
 ## Redefine for TM1
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "TM1")
index aeaff6c..a948506 100644 (file)
@@ -1,6 +1,6 @@
 Name: mobileap-agent
 Summary: Mobile AP daemon for setting tethering environments
-Version: 1.0.103
+Version: 1.0.104
 Release: 1
 Group: System/Network
 License: Apache-2.0
index 9002541..495598e 100644 (file)
@@ -93,7 +93,6 @@ static void __handle_device_name_changed_cb(keynode_t *key, void *data)
        Tethering *obj = (Tethering *)data;
        char *vconf_key = NULL;
        softap_settings_t *new_settings = _get_softap_settings();
-       softap_security_type_e sec_type;
 
        if (!_mobileap_is_enabled(MOBILE_AP_STATE_WIFI | MOBILE_AP_STATE_WIFI_AP))
                return;
@@ -106,11 +105,7 @@ static void __handle_device_name_changed_cb(keynode_t *key, void *data)
 
        if (g_strcmp0(vconf_key, new_settings->ssid) != 0) {
                DBG("Device name is changed\n");
-               if (!g_strcmp0(new_settings->security_type, SOFTAP_SECURITY_TYPE_WPA2_PSK_STR))
-                       sec_type = SOFTAP_SECURITY_TYPE_WPA2_PSK;
-               else
-                       sec_type = SOFTAP_SECURITY_TYPE_OPEN;
-
+               g_strlcpy(new_settings->ssid, vconf_key, sizeof(new_settings->ssid));
                if (_mobileap_is_enabled(MOBILE_AP_STATE_WIFI)) {
                        _reload_softap_settings(obj, new_settings);
                }
index 04bcd21..dab030e 100755 (executable)
@@ -901,7 +901,6 @@ gboolean tethering_reload_wifi_settings(Tethering *obj,
        mobile_ap_error_code_e ret = MOBILE_AP_ERROR_NONE;
        gboolean ret_val = TRUE;
        softap_settings_t settings = {0, };
-       mobile_ap_address_type_e address_type = _mobileap_get_ipv6_state(MOBILE_AP_STATE_WIFI);
 
        DBG("+\n");
        g_assert(obj != NULL);
@@ -1354,13 +1353,12 @@ gboolean softap_reload_settings(Softap *obj,
        g_assert(obj != NULL);
        g_assert(context != NULL);
 
-       /* TODO : setup settings structure */
        g_strlcpy(settings.ssid, ssid, sizeof(settings.ssid));
        if (security_type == SOFTAP_SECURITY_TYPE_WPA2_PSK) {
                g_strlcpy(settings.key, key, sizeof(settings.key));
                g_strlcpy(settings.security_type, SOFTAP_SECURITY_TYPE_WPA2_PSK_STR,
                                sizeof(settings.security_type));
-       } else if (settings.security_type == SOFTAP_SECURITY_TYPE_WPS) {
+       } else if (security_type == SOFTAP_SECURITY_TYPE_WPS) {
                g_strlcpy(settings.key, "00000000", sizeof(settings.key));
                g_strlcpy(settings.security_type, SOFTAP_SECURITY_TYPE_WPS_STR,
                                sizeof(settings.security_type));
@@ -1377,7 +1375,6 @@ gboolean softap_reload_settings(Softap *obj,
        settings.max_sta = MOBILE_AP_MAX_WIFI_STA;
        settings.mac_filter = 0;
 
-
        ret = _reload_softap_settings_for_softap(obj, &settings);
        if (ret != MOBILE_AP_ERROR_NONE) {
                ERR("_reload_softap_settings is failed\n");