From: Jiwan Kim <ji-wan.kim@samsung.com>
Date: Fri, 9 Sep 2016 05:02:38 +0000 (+0900)
Subject: Fix SVACE issues on network menu and build errors
X-Git-Tag: accepted/tizen/tv/20160923.050049~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe48d72b6fb6a56b12e7e533b202946d93f0719c;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git

Fix SVACE issues on network menu and build errors

Change-Id: I8d43289ea2b216ed801a5076398e821a24937335
---

diff --git a/src/data/system/data_wired.c b/src/data/system/data_wired.c
index 8284b8b..5954e07 100644
--- a/src/data/system/data_wired.c
+++ b/src/data/system/data_wired.c
@@ -56,8 +56,8 @@ bool get_ethernet_profile(struct _connection_data *data)
 	int rv = 0;
 	connection_profile_iterator_h iter;
 	connection_profile_type_e type;
-	//connection_profile_state_e state;
-	connection_profile_h profile;
+	/* connection_profile_state_e state; */
+	connection_profile_h profile = NULL;
 	char *ipaddr = NULL;
 	char *name = NULL;
 
diff --git a/src/data/system/data_wireless.c b/src/data/system/data_wireless.c
index 4312c2e..a60ec3a 100644
--- a/src/data/system/data_wireless.c
+++ b/src/data/system/data_wireless.c
@@ -64,7 +64,8 @@ static void *_create(void (*event_cb)(enum event_type type, void *data),
 
 	if (wifi_initialize() != WIFI_ERROR_NONE) {
 		_ERR("wifi_initialize failed.");
-		event_cb(EVENT_DATA_INIT_FAIL_WIRELESS, cb_data);
+		if (event_cb)
+			event_cb(EVENT_DATA_INIT_FAIL_WIRELESS, cb_data);
 
 		free(priv);
 		return NULL;
diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c
index 2169282..5f07976 100644
--- a/src/layout/layout_system.c
+++ b/src/layout/layout_system.c
@@ -81,7 +81,7 @@ static struct menumgr_info menu_info[] = {
 		.style = STYLE_STATUS_BTN,
 		.disabled = EINA_FALSE,
 		.favorite = EINA_FALSE,
-		.status = _get_clock_mode,
+		/*.status = _get_clock_mode,*/
 		.selected = _selected,
 		.focused = _focused,
 		.selected_menu = _selected_menu,
@@ -94,7 +94,7 @@ static struct menumgr_info menu_info[] = {
 		.title = STR_SLEEP_TIMER,
 		.style = STYLE_STATUS_BTN,
 		.disabled = EINA_FALSE,
-		.status = _get_sleep_timer,
+		/*.status = _get_sleep_timer,*/
 		.selected = _selected,
 		.focused = _focused,
 		.selected_menu = _selected_menu,
@@ -107,7 +107,7 @@ static struct menumgr_info menu_info[] = {
 		.title = STR_WAKEUP_TIMER,
 		.style = STYLE_TEXTBLOCK_BTN,
 		.disabled = EINA_FALSE,
-		.status = _get_wakeup_timer,
+		/*.status = _get_wakeup_timer,*/
 		.selected = _selected,
 		.focused = _focused,
 		.selected_menu = _selected_menu,
@@ -145,7 +145,7 @@ static struct menumgr_info menu_info[] = {
 		.title = STR_SUBTITLE,
 		.style = STYLE_STATUS_BTN,
 		.disabled = EINA_FALSE,
-		.status = _get_subtitle,
+		/*.status = _get_subtitle,*/
 		.selected = _selected,
 		.focused = _focused,
 		.selected_menu = _selected_menu,
diff --git a/src/view/view_base.c b/src/view/view_base.c
index 6edb02d..257661f 100644
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -469,7 +469,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 		return NULL;
 	}
 
-	_tab_order_restore();
+	//_tab_order_restore();
 
 	priv->base = utils_add_layout(win, GRP_VIEW_BASE, EINA_TRUE);
 	if (!priv->base) {
diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c
index 7296e54..d166fac 100644
--- a/src/view/view_new_network.c
+++ b/src/view/view_new_network.c
@@ -654,12 +654,18 @@ static void _markup_cb(void *data, Evas_Object *entry, char **text)
 	const char *buf = NULL;
 	bool ignore = false;
 	int val_priv = 0, val_input = 0;
+	int candidate = 0;
 
 	if (!priv) {
 		_ERR("invalid data");
 		return;
 	}
 
+	if (NULL == text || NULL == *text) {
+		_ERR("invalid text");
+		return;
+	}
+
 	buf = elm_entry_entry_get(entry);
 	if (!buf)
 		return;
@@ -681,18 +687,15 @@ static void _markup_cb(void *data, Evas_Object *entry, char **text)
 	}
 
 	/* Check range (0 to 255) */
-	if (text && *text) {
-		int candidate = 0;
-		val_priv  = atoi(buf);
-		val_input = atoi(*text);
-		candidate = val_priv * 10 + val_input;
-
-		if (0 > val_priv || 255 < val_priv
-		 || 0 > candidate || 255 < candidate) {
-			/* Ignore input value */
-			*text = NULL;
-			return;
-		}
+	val_priv  = atoi(buf);
+	val_input = atoi(*text);
+	candidate = val_priv * 10 + val_input;
+
+	if (0 > val_priv || 255 < val_priv
+	 || 0 > candidate || 255 < candidate) {
+		/* Ignore input value */
+		*text = NULL;
+		return;
 	}
 
 	/* Update done btn state */