From dfc3491356a325925a2da43ed172dc8700c63ef4 Mon Sep 17 00:00:00 2001 From: "kj7.sung" Date: Fri, 9 Sep 2016 13:55:44 +0900 Subject: [PATCH] svace : defect fixed Change-Id: I75eb5faddef818a890e501f6ea0876e7dbd588a3 Signed-off-by: kj7.sung --- location/manager/location-passive.c | 16 ++++++++++------ location/manager/location.c | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/location/manager/location-passive.c b/location/manager/location-passive.c index 778930f..1663f86 100755 --- a/location/manager/location-passive.c +++ b/location/manager/location-passive.c @@ -136,10 +136,12 @@ static int __set_started(gpointer self, gboolean started) static void passive_gps_cb(keynode_t * key, gpointer self) { LOC_FUNC_LOG + g_return_if_fail(key); + g_return_if_fail(self); LocationPassivePrivate *priv = GET_PRIVATE(self); - g_return_val_if_fail(priv, LOCATION_ERROR_NOT_AVAILABLE); - g_return_val_if_fail(priv->mod, LOCATION_ERROR_NOT_AVAILABLE); - g_return_val_if_fail(priv->mod->handler, LOCATION_ERROR_NOT_AVAILABLE); + g_return_if_fail(priv); + g_return_if_fail(priv->mod); + g_return_if_fail(priv->mod->handler); LocationPosition *pos = NULL; LocationVelocity *vel = NULL; @@ -162,10 +164,12 @@ static void passive_gps_cb(keynode_t * key, gpointer self) static void passive_wps_cb(keynode_t *key, gpointer self) { LOC_FUNC_LOG + g_return_if_fail(key); + g_return_if_fail(self); LocationPassivePrivate *priv = GET_PRIVATE(self); - g_return_val_if_fail(priv, LOCATION_ERROR_NOT_AVAILABLE); - g_return_val_if_fail(priv->mod, LOCATION_ERROR_NOT_AVAILABLE); - g_return_val_if_fail(priv->mod->handler, LOCATION_ERROR_NOT_AVAILABLE); + g_return_if_fail(priv); + g_return_if_fail(priv->mod); + g_return_if_fail(priv->mod->handler); LocationPosition *pos = NULL; LocationVelocity *vel = NULL; diff --git a/location/manager/location.c b/location/manager/location.c index 4d53cab..e84decb 100755 --- a/location/manager/location.c +++ b/location/manager/location.c @@ -567,11 +567,8 @@ location_get_last_velocity(LocationObject *obj, LocationVelocity **velocity, Loc EXPORT_API int location_get_accessibility_state(LocationAccessState *state) { - int ret = LOCATION_ERROR_NONE; - #ifndef TIZEN_PROFILE_TV - ret = location_check_cynara(LOCATION_PRIVILEGE); -#endif + int ret = location_check_cynara(LOCATION_PRIVILEGE); if (ret == LOCATION_ERROR_NONE) { *state = LOCATION_ACCESS_ALLOWED; @@ -579,6 +576,9 @@ location_get_accessibility_state(LocationAccessState *state) *state = LOCATION_ACCESS_DENIED; LOCATION_LOGE("Cannot use location service for privacy[%d]", ret); } +#else + *state = LOCATION_ACCESS_ALLOWED; +#endif return LOCATION_ERROR_NONE; } -- 2.7.4