Replace ERR with _E macro.

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

14 files changed, 38 insertions, 34 deletions

diff --git a/src/modules/clock/clock.c b/src/modules/clock/clock.c
index 254e499..7398433 100644
--- a/src/modules/clock/clock.c
+++ b/src/modules/clock/clock.c
@@ -485,7 +485,7 @@ void indicator_get_apm_by_region(char* output,void *data)
 	i18n_udate date;
 	ret = i18n_ucalendar_get_now(&date);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("i18n_ucalendar_get_now failed: %d", ret);
+		_E("i18n_ucalendar_get_now failed: %d", ret);
 		free(locale);
 		free(timezone_id);
 		return;
@@ -564,7 +564,7 @@ void indicator_get_time_by_region(char* output,void *data)
 	_D("Locale: %s", locale);
 
 	if (locale == NULL) {
-		ERR("[Error] get value of fail.");
+		_E("[Error] get value of fail.");
 		return;
 	}
 
@@ -600,7 +600,7 @@ void indicator_get_time_by_region(char* output,void *data)
 	i18n_udate date;
 	ret = i18n_ucalendar_get_now(&date);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("i18n_ucalendar_get_now failed: %d", ret);
+		_E("i18n_ucalendar_get_now failed: %d", ret);
 		free(locale);
 		return;
 	}
@@ -664,19 +664,19 @@ static void ICU_set_timezone(const char *timezone)
 	i18n_timezone_h tmz;
 
 	if (timezone == NULL) {
-		ERR("TIMEZONE is NULL");
+		_E("TIMEZONE is NULL");
 		return;
 	}
 
 	int ret = i18n_timezone_create(&tmz, timezone);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("Unable to create timezone handle from %s: %d", timezone, ret);
+		_E("Unable to create timezone handle from %s: %d", timezone, ret);
 		return;
 	}
 
 	ret = i18n_timezone_set_default(tmz);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("Unable to set default timezone to %s: %d", timezone, ret);
+		_E("Unable to set default timezone to %s: %d", timezone, ret);
 	}
 
 	i18n_timezone_destroy(tmz);
diff --git a/src/modules/connection/mobile_hotspot.c b/src/modules/connection/mobile_hotspot.c
index 01a72a9..4c03f88 100644
--- a/src/modules/connection/mobile_hotspot.c
+++ b/src/modules/connection/mobile_hotspot.c
@@ -239,21 +239,21 @@ static int _tethering_data_init(tethering_data_t *data)
 	ret = tethering_set_connection_state_changed_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_connection_state_changed, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_connection_state_changed_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_connection_state_changed_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
 	ret = tethering_set_enabled_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_enabled_changed, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_enabled_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_enabled_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
 	ret = tethering_set_disabled_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_disabled, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_disabled_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_disabled_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
diff --git a/src/modules/connection/wifi.c b/src/modules/connection/wifi.c
index bb42401..f6602b2 100644
--- a/src/modules/connection/wifi.c
+++ b/src/modules/connection/wifi.c
@@ -109,7 +109,7 @@ static void show_wifi_transfer_icon(void *data)
 	int status = 0;
 
 	if (vconf_get_int(VCONFKEY_WIFI_TRANSFER_STATE, &status) < 0) {
-		ERR("Error getting VCONFKEY_WIFI_TRANSFER_STATE value");
+		_E("Error getting VCONFKEY_WIFI_TRANSFER_STATE value");
 		return;
 	}
 
@@ -252,28 +252,28 @@ static int register_wifi_module(void *data)
 
 	ret = wifi_set_device_state_changed_cb(_wifi_device_state_changed, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_set_device_state_changed_cb failed: %s", get_error_message(ret));
+		_E("wifi_set_device_state_changed_cb failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = util_wifi_set_connection_state_changed_cb(_wifi_connection_state_changed, data);
 	if (ret != 0) {
-		ERR("util_wifi_set_connection_state_changed_cb failed");
+		_E("util_wifi_set_connection_state_changed_cb failed");
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = wifi_set_rssi_level_changed_cb(_wifi_rssi_level_changed, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_set_rssi_level_changed_cb failed: %s", get_error_message(ret));
+		_E("wifi_set_rssi_level_changed_cb failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = vconf_notify_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_changed_cb, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("vconf_notify_key_changed failed: %s", get_error_message(ret));
+		_E("vconf_notify_key_changed failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
@@ -292,7 +292,7 @@ static int unregister_wifi_module(void)
 
 	int ret = wifi_deinitialize();
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_deinitialize failed : %s", get_error_message(ret));
+		_E("wifi_deinitialize failed : %s", get_error_message(ret));
 	}
 
 	return OK;
diff --git a/src/modules/information/alarm.c b/src/modules/information/alarm.c
index 633f5cf..4f35ba7 100644
--- a/src/modules/information/alarm.c
+++ b/src/modules/information/alarm.c
@@ -112,7 +112,7 @@ static void indicator_alarm_change_cb(keynode_t *node, void *data)
 		hide_image_icon();
 		return;
 	}
-	ERR("Failed to get alarm count!");
+	_E("Failed to get alarm count!");
 	return;
 }
 
@@ -150,7 +150,7 @@ static int register_alarm_module(void *data)
 	set_app_state(data);
 	if (ret < 0)
 	{
-		ERR("Fail to init alarmdb.");
+		_E("Fail to init alarmdb.");
 		return FAIL;
 	}
 
diff --git a/src/modules/information/noti.c b/src/modules/information/noti.c
index c48edee..56c8eb5 100644
--- a/src/modules/information/noti.c
+++ b/src/modules/information/noti.c
@@ -145,7 +145,7 @@ char *__indicator_ui_get_pkginfo_icon(const char *pkgid)
 	ret = app_info_get_icon(app_info, &icon_path);
 	if (ret != APP_MANAGER_ERROR_NONE) {
 		app_info_destroy(app_info);
-		ERR("app_info_get_icon failed %d", ret);
+		_E("app_info_get_icon failed %d", ret);
 		return NULL;
 	}
 
diff --git a/src/modules/information/video_play.c b/src/modules/information/video_play.c
index 677cc4c..7d1d5ea 100644
--- a/src/modules/information/video_play.c
+++ b/src/modules/information/video_play.c
@@ -27,6 +27,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"VIDEO_PLAY"
diff --git a/src/modules/information/voice_recorder.c b/src/modules/information/voice_recorder.c
index dcc7c63..6b2d13c 100644
--- a/src/modules/information/voice_recorder.c
+++ b/src/modules/information/voice_recorder.c
@@ -27,6 +27,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_MINICTRL1
 #define MODULE_NAME		"VOICE_RECORDER"
diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index 8700964..d092c5b 100644
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -603,7 +603,7 @@ static void indicator_battery_update_display(void *data)
 
 	if (battery_percentage < 0)
 	{
-		ERR("Invalid Battery Capacity in percents: %d", battery_percentage);
+		_E("Invalid Battery Capacity in percents: %d", battery_percentage);
 		return;
 	}
 
@@ -640,7 +640,7 @@ static void indicator_battery_check_charging(void *data)
 
 	if (ret != DEVICE_ERROR_NONE)
 	{
-		ERR("Fail to get battery charging status");
+		_E("Fail to get battery charging status");
 		return;
 	} else {
 		_D("Battery charge Status: %d", status);
diff --git a/src/modules/processing/downloading.c b/src/modules/processing/downloading.c
index ced3990..8299cf3 100644
--- a/src/modules/processing/downloading.c
+++ b/src/modules/processing/downloading.c
@@ -26,6 +26,7 @@
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"downloading"
@@ -98,7 +99,7 @@ static void show_downloading_icon(void* data)
 	}
 	else
 	{
-		ERR("show_downloading_icon!, timer");
+		_E("show_downloading_icon!, timer");
 	}
 }
 
@@ -132,7 +133,7 @@ static void indicator_downloading_change_cb(keynode_t *node, void *data)
 	{
 		result = result | status;
 	} else {
-		ERR("Error getting VCONFKEY_WIFI_DIRECT_RECEIVING_STATE value");
+		_E("Error getting VCONFKEY_WIFI_DIRECT_RECEIVING_STATE value");
 	}*/
 
 	if (result == 1) {
@@ -151,7 +152,7 @@ static void indicator_downloading_pm_state_change_cb(keynode_t *node, void *data
 
 	if (vconf_get_int(VCONFKEY_PM_STATE, &status) < 0)
 	{
-		ERR("Error getting VCONFKEY_PM_STATE value");
+		_E("Error getting VCONFKEY_PM_STATE value");
 
 		if (timer != NULL)
 		{
diff --git a/src/modules/processing/uploading.c b/src/modules/processing/uploading.c
index 9c07780..f0351a2 100644
--- a/src/modules/processing/uploading.c
+++ b/src/modules/processing/uploading.c
@@ -26,6 +26,7 @@
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"uploading"
@@ -98,7 +99,7 @@ static void show_uploading_icon(void* data)
 	}
 	else
 	{
-		ERR("show_uploading_icon!, timer");
+		_E("show_uploading_icon!, timer");
 	}
 }
 
@@ -132,7 +133,7 @@ static void indicator_uploading_change_cb(keynode_t *node, void *data)
 	{
 		result = result | status;
 	} else {
-		ERR("Failed to get VCONFKEY_WIFI_DIRECT_SENDING_STATE value");
+		_E("Failed to get VCONFKEY_WIFI_DIRECT_SENDING_STATE value");
 	}*/
 
 	if (result == 1) {
diff --git a/src/modules/setting/bluetooth.c b/src/modules/setting/bluetooth.c
index 5d6b5ee..8d0770a 100644
--- a/src/modules/setting/bluetooth.c
+++ b/src/modules/setting/bluetooth.c
@@ -240,9 +240,9 @@ static int register_bluetooth_module(void *data)
 
 	// Register bluetooth adapter state call-back.
 	ret = bt_initialize();
-	if(ret != BT_ERROR_NONE) ERR("bt_initialize failed");
+	if(ret != BT_ERROR_NONE) _E("bt_initialize failed");
 	ret = bt_adapter_set_state_changed_cb(indicator_bluetooth_adapter_state_changed_cb, data);
-	if(ret != BT_ERROR_NONE) ERR("bt_adapter_set_state_changed_cb failed");
+	if(ret != BT_ERROR_NONE) _E("bt_adapter_set_state_changed_cb failed");
 
 	ret = bt_device_set_connection_state_changed_cb(indicator_bluetooth_change_cb, data);
 	if (ret != BT_ERROR_NONE)
@@ -263,9 +263,9 @@ static int unregister_bluetooth_module(void)
 
 	// Unregister bluetooth adapter state call-back.
 	ret = bt_adapter_unset_state_changed_cb();
-	if(ret != BT_ERROR_NONE) ERR("bt_adapter_unset_state_changed_cb failed");
+	if(ret != BT_ERROR_NONE) _E("bt_adapter_unset_state_changed_cb failed");
 	ret = bt_deinitialize();
-	if(ret != BT_ERROR_NONE) ERR("bt_deinitialize failed");
+	if(ret != BT_ERROR_NONE) _E("bt_deinitialize failed");
 
 	return ret;
 }
diff --git a/src/modules/setting/gps.c b/src/modules/setting/gps.c
index a44a4bd..6a3adc4 100644
--- a/src/modules/setting/gps.c
+++ b/src/modules/setting/gps.c
@@ -114,7 +114,7 @@ static int indicator_gps_state_get(void)
 
 	if (runtime_info_get_value_int(RUNTIME_INFO_KEY_GPS_STATUS, (int *)&gps_status) < 0)
 	{
-		ERR("Error getting RUNTIME_INFO_KEY_GPS_STATUS value");
+		_E("Error getting RUNTIME_INFO_KEY_GPS_STATUS value");
 		return 0;
 	}
 
@@ -160,7 +160,7 @@ static void _gps_state_icon_set(int status, void *data)
 
 	default:
 		hide_image_icon();
-		ERR("Invalid value!");
+		_E("Invalid value!");
 		break;
 	}
 
diff --git a/src/modules/setting/nfc.c b/src/modules/setting/nfc.c
index cbc9437..ec3c5ef 100644
--- a/src/modules/setting/nfc.c
+++ b/src/modules/setting/nfc.c
@@ -157,7 +157,7 @@ static int unregister_nfc_module(void)
 	nfc_manager_unset_activation_changed_cb();
 
 	if (get_last_result() != NFC_ERROR_NONE)
-		ERR("Failed to unregister callback!");
+		_E("Failed to unregister callback!");
 
 	return OK;
 }
diff --git a/src/modules/setting/silent.c b/src/modules/setting/silent.c
index 56df3f0..ec60c69 100644
--- a/src/modules/setting/silent.c
+++ b/src/modules/setting/silent.c
@@ -211,11 +211,11 @@ static int unregister_silent_module(void)
 
 	ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE);
 	if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-		ERR("Failed to unset silent mode change callback function.");
+		_E("Failed to unset silent mode change callback function.");
 
 	ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED);
 	if (ret != RUNTIME_INFO_ERROR_NONE)
-		ERR("Failed to unset vibration change callback function.");
+		_E("Failed to unset vibration change callback function.");
 
 	return ret;
 }