Use default value when creating handle

Change-Id: Ic7b08750cfbb945affbf8389b621248bd5274920

diff --git a/include/softap_private.h b/include/softap_private.h
index 48b7f19d44fb8ca18a313edc86250439b70636c5..ae600e633d85d40afec3febcf12fe290bd8801c8 100644 (file)
--- a/include/softap_private.h
+++ b/include/softap_private.h
@@ -199,6 +199,7 @@ typedef enum {
 */
 
 #define SOFTAP_DEFAULT_SSID    "Tizen"
+#define SOFTAP_DEFAULT_CHANNEL 1
 #define SOFTAP_SECURITY_TYPE_OPEN_STR          "open"
 #define SOFTAP_SECURITY_TYPE_WPA2_PSK_STR      "wpa2-psk"
 #define SOFTAP_SECURITY_TYPE_WPS_STR   "wps"

diff --git a/src/softap.c b/src/softap.c
index bcbe90de1e520e31a7cb4d3b5c187a01303e4d1c..142830fd16d8702ffb46992bfcd759c6e726870d 100755 (executable)
--- a/src/softap.c
+++ b/src/softap.c
@@ -734,8 +734,6 @@ API int softap_create(softap_h *softap)
        __softap_h *sa = NULL;
        GError *error = NULL;
        char ssid[SOFTAP_SSID_MAX_LEN + 1] = {0, };
-       int channel = 1;
-       softap_wireless_mode_e mode = SOFTAP_WIRELESS_MODE_G;
 
        sa = (__softap_h *) malloc(sizeof(__softap_h));
 
@@ -744,15 +742,12 @@ API int softap_create(softap_h *softap)
        sa->visibility = true;
        sa->sec_type = SOFTAP_SECURITY_TYPE_WPA2_PSK;
 
-       if (__get_ssid_from_vconf(VCONFKEY_SOFTAP_SSID, ssid, sizeof(ssid)) == false) {
-               if (__get_common_ssid(ssid, sizeof(ssid)) != SOFTAP_ERROR_NONE) {
-                       //LCOV_EXCL_START
-                       ERR("Fail to get default ssid!!");
-                       free(sa);
-                       return SOFTAP_ERROR_OPERATION_FAILED;
-                       //LCOV_EXCL_STOP
-               }
-
+       if (__get_common_ssid(ssid, sizeof(ssid)) != SOFTAP_ERROR_NONE) {
+               //LCOV_EXCL_START
+               ERR("Fail to get default ssid!!");
+               free(sa);
+               return SOFTAP_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
 
        sa->ssid = g_strdup(ssid);
@@ -773,14 +768,8 @@ API int softap_create(softap_h *softap)
 //LCOV_EXCL_STOP
        }
 
-       if (__get_channel(&channel) != SOFTAP_ERROR_NONE)
-               ERR("Fail to get saved channel!!");
-
-       if (__get_mode(&mode) != SOFTAP_ERROR_NONE)
-               ERR("Fail to get saved mode!!");
-
-       sa->channel = channel;
-       sa->mode = mode;
+       sa->channel = SOFTAP_DEFAULT_CHANNEL;
+       sa->mode = SOFTAP_WIRELESS_MODE_G;
        sa->dhcp_enabled = false;
 
        /* GDbus Setting */