Remove macros that are using internal apis.sandbox/stanluk/tizen_sdk

Other macros used instead.

Change-Id: I64f766493e7ed865207523de8b30959f63a7833b
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

15 files changed, 44 insertions, 44 deletions

diff --git a/src/modules/clock/clock.c b/src/modules/clock/clock.c
index 7398433..7164598 100644
--- a/src/modules/clock/clock.c
+++ b/src/modules/clock/clock.c
@@ -367,7 +367,7 @@ static int register_clock_module(void *data)
 	int ret = -1;
 	int i;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
@@ -428,8 +428,8 @@ void indicator_get_apm_by_region(char* output,void *data)
 {
 	int ret = -1;
 	char *locale = NULL;
-	retif(data == NULL, , "Data parameter is NULL");
-	retif(output == NULL, , "output parameter is NULL");
+	retm_if(data == NULL, "Data parameter is NULL");
+	retm_if(output == NULL, "output parameter is NULL");
 
 	i18n_uchar u_custom_skeleton[CLOCK_STR_LEN] = { 0, };
 	i18n_uchar u_timezone[64] = {0,};
@@ -532,8 +532,8 @@ void indicator_get_time_by_region(char* output,void *data)
 {
 	int ret = -1;
 	char *locale;
-	retif(data == NULL, , "Data parameter is NULL");
-	retif(output == NULL, , "output parameter is NULL");
+	retm_if(data == NULL, "Data parameter is NULL");
+	retm_if(output == NULL, "output parameter is NULL");
 
 	i18n_uchar u_custom_skeleton[CLOCK_STR_LEN] = { 0, };
 	i18n_uchar u_timezone[64] = {0,};
@@ -706,7 +706,7 @@ static char *_access_info_cb(void *data, Evas_Object *obj)
 	time_t ctime;
 	int len;
 
-	retif(data == NULL,NULL, "Invalid parameter!");
+	retvm_if(data == NULL, NULL, "Invalid parameter!");
 	char *timezone = util_get_timezone_str();
 	ICU_set_timezone(timezone);
 	if(timezone!=NULL)
@@ -792,7 +792,7 @@ static int register_clock_tts(void *data,int win_type)
 {
 	int r = 0, ret = -1;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	Evas_Object *to = NULL;
 	Evas_Object *ao = NULL;
diff --git a/src/modules/connection/dock.c b/src/modules/connection/dock.c
index 9ef8734..6712e10 100644
--- a/src/modules/connection/dock.c
+++ b/src/modules/connection/dock.c
@@ -93,7 +93,7 @@ static void indicator_dock_change_cb(keynode_t *node, void *data)
 	int status;
 	int ret;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	/* First, check dock status */
 	ret = vconf_get_int(VCONFKEY_SYSMAN_CRADLE_STATUS, &status);
@@ -117,7 +117,7 @@ static int register_dock_module(void *data)
 {
 	int r = 0, ret = -1;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/information/alarm.c b/src/modules/information/alarm.c
index 4f35ba7..e37b74b 100644
--- a/src/modules/information/alarm.c
+++ b/src/modules/information/alarm.c
@@ -99,7 +99,7 @@ static void indicator_alarm_change_cb(keynode_t *node, void *data)
 	int status = 0;
 	int ret;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	ret = vconf_get_int(VCONFKEY_ALARM_STATE, &status);
 	if (ret == OK) {
@@ -145,7 +145,7 @@ static int register_alarm_module(void *data)
 {
 	int ret = -1;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 	if (ret < 0)
diff --git a/src/modules/information/earphone.c b/src/modules/information/earphone.c
index a06287e..473b83a 100644
--- a/src/modules/information/earphone.c
+++ b/src/modules/information/earphone.c
@@ -88,7 +88,7 @@ void check_jack_port(void *data)
 	bool is_tv_out_connected;
 	int ret;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag()==0) {
 		updated_while_lcd_off = 1;
@@ -127,7 +127,7 @@ static int register_earphone_module(void *data)
 {
 	int ret;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/information/ext_storage.c b/src/modules/information/ext_storage.c
index 99546d0..435d526 100644
--- a/src/modules/information/ext_storage.c
+++ b/src/modules/information/ext_storage.c
@@ -167,7 +167,7 @@ static bool _storage_register_cb(int storage_id, storage_type_e type, storage_st
 static int register_ext_storage_module(void *data)
 {
 	int ret;
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/information/fm_radio.c b/src/modules/information/fm_radio.c
index 82c60e9..1944fdf 100644
--- a/src/modules/information/fm_radio.c
+++ b/src/modules/information/fm_radio.c
@@ -82,7 +82,7 @@ static void indicator_fm_radio_change_cb(void *data)
 	int ret = -1;
 
 	_D("indicator_fm_radio_change_cb called!");
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if (ret == OK) {
 		_D("FM_RADIO state: %d", status);
@@ -112,7 +112,7 @@ static int register_fm_radio_module(void *data)
 	int ret = -1;
 
 	_D("register_fm_radio_module called!");
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/information/video_play.c b/src/modules/information/video_play.c
index 7d1d5ea..4aad216 100644
--- a/src/modules/information/video_play.c
+++ b/src/modules/information/video_play.c
@@ -88,7 +88,7 @@ static void show_video_icon(void *data)
 	int status;
 	int ret;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 
 	if (icon_get_update_flag() == 0) {
@@ -111,7 +111,7 @@ static void show_video_icon(void *data)
 
 static void indicator_video_play_change_cb(keynode_t *node, void *data)
 {
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	show_video_icon(data);
 
@@ -136,7 +136,7 @@ static int wake_up_cb(void *data)
 static int register_video_play_module(void *data)
 {
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/information/voice_recorder.c b/src/modules/information/voice_recorder.c
index 6b2d13c..5088297 100644
--- a/src/modules/information/voice_recorder.c
+++ b/src/modules/information/voice_recorder.c
@@ -115,7 +115,7 @@ static void hide_image_icon(void)
 
 static void show_voicerecoder_icon(void *data)
 {
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag() == 0) {
 		updated_while_lcd_off = 1;
@@ -148,7 +148,7 @@ static void show_voicerecoder_icon(void *data)
 #if 0
 static void indicator_voice_recorder_change_cb(keynode_t *node, void *data)
 {
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	show_voicerecoder_icon(data);
 	return;
@@ -180,7 +180,7 @@ void hide_voice_recorder_icon(void)
 static int register_voice_recorder_module(void *data)
 {
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 	show_voicerecoder_icon(data);
diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index d092c5b..2c7c023 100644
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -509,7 +509,7 @@ static void indicator_battery_level_init(void)
 static Eina_Bool indicator_battery_charging_ani_cb(void *data)
 {
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	if (_level.current_level == _level.max_level) {
 		aniIndex = _level.max_level;
@@ -532,7 +532,7 @@ static Eina_Bool indicator_battery_charging_ani_cb(void *data)
 
 static int indicator_change_battery_image_level(void *data, int level)
 {
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	if(is_battery_percentage_shown)
 	{
@@ -588,7 +588,7 @@ static void indicator_battery_update_display(void *data)
 	int ret;
 	int level = 0;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag()==0)
 	{
@@ -679,7 +679,7 @@ static void indicator_battery_pm_state_change_cb(device_callback_e type, void *v
 {
 	display_state_e display_state;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	display_state = device_display_get_state(&display_state);
 
@@ -717,7 +717,7 @@ static int register_battery_module(void *data)
 	int r = 0;
 	int ret = -1;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	/* DO NOT change order of below fuctions */
 	set_app_state(data);
diff --git a/src/modules/processing/downloading.c b/src/modules/processing/downloading.c
index 8299cf3..a021f8d 100644
--- a/src/modules/processing/downloading.c
+++ b/src/modules/processing/downloading.c
@@ -120,7 +120,7 @@ static void indicator_downloading_change_cb(keynode_t *node, void *data)
 	/*int status = 0;*/
 	int result = 0;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag()==0)
 	{
@@ -148,7 +148,7 @@ static void indicator_downloading_pm_state_change_cb(keynode_t *node, void *data
 {
 	int status = 0;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if (vconf_get_int(VCONFKEY_PM_STATE, &status) < 0)
 	{
@@ -187,7 +187,7 @@ static int register_downloading_module(void *data)
 {
 	int ret = 0;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/processing/uploading.c b/src/modules/processing/uploading.c
index f0351a2..1c64a3b 100644
--- a/src/modules/processing/uploading.c
+++ b/src/modules/processing/uploading.c
@@ -120,7 +120,7 @@ static void indicator_uploading_change_cb(keynode_t *node, void *data)
 	/*int status = 0;*/
 	int result = 0;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag()==0)
 	{
@@ -148,7 +148,7 @@ static void indicator_uploading_pm_state_change_cb(keynode_t *node, void *data)
 {
 	int status = 0;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	vconf_get_int(VCONFKEY_PM_STATE, &status);
 
@@ -176,7 +176,7 @@ static int register_uploading_module(void *data)
 {
 	int ret = 0;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/setting/bluetooth.c b/src/modules/setting/bluetooth.c
index 8d0770a..1b52b68 100644
--- a/src/modules/setting/bluetooth.c
+++ b/src/modules/setting/bluetooth.c
@@ -160,7 +160,7 @@ static bool _bt_cb(bt_device_info_s *device_info, void *user_data)
 {
 	// For every paired device check if it's connected with any profile
 	int ret = bt_device_foreach_connected_profiles(device_info->remote_address, _connected_cb, user_data);
-	retif(ret != BT_ERROR_NONE, true, "bt_device_foreach_connected_profiles failed[%d]", ret);
+	retvm_if(ret != BT_ERROR_NONE, true, "bt_device_foreach_connected_profiles failed[%d]", ret);
 
 	return true;
 }
@@ -172,7 +172,7 @@ static void indicator_bluetooth_change_cb(bool connected, bt_device_connection_i
 	int result = NO_DEVICE;
 	bt_adapter_state_e adapter_state = BT_ADAPTER_DISABLED;
 
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if (icon_get_update_flag() == 0) {
 		updated_while_lcd_off = 1;
@@ -181,14 +181,14 @@ static void indicator_bluetooth_change_cb(bool connected, bt_device_connection_i
 	updated_while_lcd_off = 0;
 
 	ret = bt_adapter_get_state(&adapter_state);
-	retif(ret != BT_ERROR_NONE, , "bt_adapter_get_state failed");
+	retm_if(ret != BT_ERROR_NONE, "bt_adapter_get_state failed");
 	if (adapter_state != BT_ADAPTER_ENABLED) {  // If adapter_state is NULL. hide_image_icon().
 		_D("BT is not enabled. So don't need to update BT icon.");
 		return;
 	}
 
 	ret = bt_adapter_foreach_bonded_device(_bt_cb, (void *)&result);
-	retif(ret != BT_ERROR_NONE, , "bt_adapter_foreach_bonded_device failed");
+	retm_if(ret != BT_ERROR_NONE, "bt_adapter_foreach_bonded_device failed");
 	show_bluetooth_icon(data, result);
 
 	return;
@@ -234,7 +234,7 @@ static int register_bluetooth_module(void *data)
 	int r = 0, ret = -1;
 	bt_adapter_state_e adapter_state = BT_ADAPTER_DISABLED;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
@@ -249,7 +249,7 @@ static int register_bluetooth_module(void *data)
 		r = -1;
 
 	ret = bt_adapter_get_state(&adapter_state);
-	retif(ret != BT_ERROR_NONE, -1, "bt_adapter_get_state failed");
+	retvm_if(ret != BT_ERROR_NONE, -1, "bt_adapter_get_state failed");
 
 	indicator_bluetooth_change_cb(false, NULL, data);
 	indicator_bluetooth_adapter_state_changed_cb(0, adapter_state, data);
diff --git a/src/modules/setting/gps.c b/src/modules/setting/gps.c
index 6a3adc4..5a3040c 100644
--- a/src/modules/setting/gps.c
+++ b/src/modules/setting/gps.c
@@ -212,7 +212,7 @@ static int register_gps_module(void *data)
 {
 	int ret;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
diff --git a/src/modules/setting/nfc.c b/src/modules/setting/nfc.c
index 6af82bc..d5cef29 100644
--- a/src/modules/setting/nfc.c
+++ b/src/modules/setting/nfc.c
@@ -95,7 +95,7 @@ static void hide_image_icon(void)
 
 static void indicator_nfc_change_cb(bool activated, void *data)
 {
-	retif(data == NULL, , "Invalid parameter!");
+	retm_if(data == NULL, "Invalid parameter!");
 
 	if(icon_get_update_flag()==0) {
 		updated_while_lcd_off = 1;
@@ -136,12 +136,12 @@ static int register_nfc_module(void *data)
 	int ret;
 	bool status;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
 
 	ret = nfc_manager_set_activation_changed_cb(indicator_nfc_change_cb, data);
-	retif(ret != NFC_ERROR_NONE, FAIL, "Failed to register callback!");
+	retvm_if(ret != NFC_ERROR_NONE, FAIL, "Failed to register callback!");
 
 	status = nfc_manager_is_activated();
 	ret = get_last_result();
diff --git a/src/modules/setting/wifi-direct.c b/src/modules/setting/wifi-direct.c
index 2d943fb..00336fe 100644
--- a/src/modules/setting/wifi-direct.c
+++ b/src/modules/setting/wifi-direct.c
@@ -175,7 +175,7 @@ static int register_wifi_direct_module(void *data)
 {
 	int ret;
 
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	retvm_if(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);