From 696a9a3fafb1fecf25e6159646303da93f479182 Mon Sep 17 00:00:00 2001 From: Maneesh Jain Date: Wed, 15 Jul 2015 18:49:37 +0530 Subject: [PATCH] [net-config]: Fix build warning error Change-Id: I534c32834c1ce4b227abbd0820f08b6bee82abb7 Signed-off-by: Maneesh Jain --- include/neterror.h | 2 ++ packaging/net-config.spec | 2 +- src/network-state.c | 1 - src/signal-handler.c | 1 + src/utils/util.c | 1 - src/wifi-power.c | 14 ++++++++------ 6 files changed, 12 insertions(+), 9 deletions(-) mode change 100644 => 100755 src/network-state.c mode change 100644 => 100755 src/signal-handler.c diff --git a/include/neterror.h b/include/neterror.h index 7502bbf..0675233 100755 --- a/include/neterror.h +++ b/include/neterror.h @@ -43,5 +43,7 @@ void netconfig_error_fail_get_sim_auth_wrong_data(GError **error); void netconfig_error_fail_get_sim_auth_delay(GError **error); void netconfig_error_invalid_parameter(GError **error); void netconfig_error_permission_denied(GError **error); +void netconfig_error_wifi_load_inprogress(GError **error); + #endif /* __NETCONFIG_ERROR_H__ */ diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 080d78f..d033364 100644 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration Module -Version: 0.1.90_34 +Version: 0.1.90_35 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/network-state.c b/src/network-state.c old mode 100644 new mode 100755 index b93c7c6..2b8ea2a --- a/src/network-state.c +++ b/src/network-state.c @@ -156,7 +156,6 @@ static struct netconfig_default_connection static void __netconfig_pop_3g_alert_syspoppup(void) { - int rv = 0; int wifi_ug_state = 0; vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); diff --git a/src/signal-handler.c b/src/signal-handler.c old mode 100644 new mode 100755 index 4c2b5bc..c62457a --- a/src/signal-handler.c +++ b/src/signal-handler.c @@ -35,6 +35,7 @@ #include "network-state.h" #include "neterror.h" #include "wifi.h" +#include "wifi-power.h" #define SIGNAL_SCAN_DONE "ScanDone" #define SIGNAL_BSS_ADDED "BSSAdded" diff --git a/src/utils/util.c b/src/utils/util.c index 16db8c8..0bf23c4 100755 --- a/src/utils/util.c +++ b/src/utils/util.c @@ -179,7 +179,6 @@ static gboolean __netconfig_test_device_picker() static void __netconfig_pop_device_picker(void) { - int rv = 0; int wifi_ug_state = 0; vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); diff --git a/src/wifi-power.c b/src/wifi-power.c index 9ba4bdc..3818709 100755 --- a/src/wifi-power.c +++ b/src/wifi-power.c @@ -115,14 +115,15 @@ static gboolean __netconfig_wifi_disable_technology(void) static gboolean __netconfig_wifi_load_driver(void) { gboolean rv = FALSE; - const char *path = WLAN_DRIVER_SCRIPT; - char *const args[] = { "wlan.sh", "start", NULL }; - char *const envs[] = { NULL }; if (netconfig_emulator_is_emulated() == TRUE) return rv; #if defined EMBEDDED_TARGET + const char *path = WLAN_DRIVER_SCRIPT; + char *const args[] = { "wlan.sh", "start", NULL }; + char *const envs[] = { NULL }; + rv = netconfig_execute_file(path, args, envs); if (rv != TRUE) { DBG("Failed to load wireless device driver"); @@ -137,14 +138,15 @@ static gboolean __netconfig_wifi_load_driver(void) gboolean netconfig_wifi_remove_driver(void) { gboolean rv = FALSE; - const char *path = WLAN_DRIVER_SCRIPT; - char *const args[] = { "wlan.sh", "stop", NULL }; - char *const env[] = { NULL }; if (netconfig_emulator_is_emulated() == TRUE) return rv; #if defined EMBEDDED_TARGET + const char *path = WLAN_DRIVER_SCRIPT; + char *const args[] = { "wlan.sh", "stop", NULL }; + char *const env[] = { NULL }; + rv = netconfig_execute_file(path, args, env); if (rv != TRUE) { DBG("Failed to remove wireless device driver"); -- 2.34.1