From: Kamil Lipiszko <k.lipiszko@samsung.com>
Date: Fri, 30 Mar 2018 08:27:29 +0000 (+0200)
Subject: Fix coverity errors
X-Git-Tag: submit/tizen/20180409.111303^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F174357%2F6;p=profile%2Fmobile%2Fapps%2Fnative%2Findicator.git

Fix coverity errors

Change-Id: Ibcceca9994df643590fc5a875c30ad0ebc076f0d
---

diff --git a/src/ticker.c b/src/ticker.c
index 4445c40..3903abd 100644
--- a/src/ticker.c
+++ b/src/ticker.c
@@ -82,7 +82,7 @@ static int _is_text_correct(const char *text)
 	return 0;
 }
 
-static int _is_security_lockscreen_launched(void)
+static bool _is_security_lockscreen_launched(void)
 {
 	int lock_state = 0;
 	int lock_type = SETTING_SCREEN_LOCK_TYPE_NONE;
@@ -92,11 +92,12 @@ static int _is_security_lockscreen_launched(void)
 	ret = vconf_get_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &lock_type);
 	retvm_if(ret, 0, "%s", get_error_message(ret));
 
-	if (lock_state == VCONFKEY_IDLE_LOCK &&
-		(lock_type != SETTING_SCREEN_LOCK_TYPE_NONE || lock_type != SETTING_SCREEN_LOCK_TYPE_SWIPE))
-			return 1;
+	if (lock_state == VCONFKEY_IDLE_LOCK
+			&& lock_type != SETTING_SCREEN_LOCK_TYPE_NONE
+			&& lock_type != SETTING_SCREEN_LOCK_TYPE_SWIPE)
+			return true;
 
-	return 0;
+	return false;
 }
 
 static bool _notification_accept(notification_h noti)
@@ -310,7 +311,7 @@ static Eina_Bool _ticker_update(void *data)
 	}
 
 	if (!ticker.current->textblock)
-		if(_ticker_view_update(ticker.current) != OK) {
+		if (_ticker_view_update(ticker.current) != OK) {
 			_ticker_noti_destroy(&ticker.current);
 			return ECORE_CALLBACK_CANCEL;
 		}
@@ -707,10 +708,18 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 		return;
 	}
 
-	ticker_info_s *ticker_info = _ticker_noti_create(op_list->noti);
-	retm_if(!ticker_info, "_ticker_noti_create failed");
+	if (_ticker_view_create() == FAIL) {
+		_E("_ticker_view_create failed");
+		_request_to_delete_noti(op_list->noti);
+	   return;
+	}
 
-	retm_if(_ticker_view_create() == FAIL, "_ticker_view_create failed");
+	ticker_info_s *ticker_info = _ticker_noti_create(op_list->noti);
+	if (!ticker_info) {
+		_E("_ticker_noti_create failed");
+		_request_to_delete_noti(op_list->noti);
+		return;
+	}
 
 	if (!ticker.current)
 		ticker.current = ticker_info;