From: taemin.yeom Date: Fri, 12 Mar 2021 07:45:56 +0000 (+0900) Subject: Improve variable naming style X-Git-Tag: submit/tizen/20210315.085912^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22152267e88f46a40b1116fed1e11a16e32845f3;p=platform%2Fcore%2Fsystem%2Flibsvi.git Improve variable naming style Change-Id: I3b36f44a6acd0dae721959562d9086997ba9a99e Signed-off-by: taemin.yeom --- diff --git a/src/check.c b/src/check.c index e09ffd7..1b5c67b 100644 --- a/src/check.c +++ b/src/check.c @@ -666,7 +666,7 @@ static int disconnect_alert_mode; static profile_e get_profile(void) { - int ret; + int ret_val; int len; char *profile = NULL; static int set = 0; @@ -674,9 +674,9 @@ static profile_e get_profile(void) if (set != 0) return set; - ret = system_info_get_platform_string(PROFILE, &profile); - if (ret < 0) { - _E("Cannot get profile(%d)", ret); //LCOV_EXCL_LINE system error + ret_val = system_info_get_platform_string(PROFILE, &profile); + if (ret_val < 0) { + _E("Cannot get profile(%d)", ret_val); //LCOV_EXCL_LINE system error return PROFILE_NONE; //LCOV_EXCL_LINE } @@ -932,7 +932,7 @@ static void profile_init(void) char *path; struct stat st; int prof; - int ret; + int ret_val; prof = get_profile(); @@ -941,8 +941,8 @@ static void profile_init(void) else if (prof == PROFILE_MOBILE) { if (vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &lock_sndstatus) < 0) _W("VCONFKEY_SETAPPL_SOUND_LOCK_BOOL ==> FAIL!!"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, feedback_lock_sndstatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, feedback_lock_sndstatus_cb, NULL); + if (ret_val != 0) _W("VCONFKEY_SETAPPL_SOUND_LOCK_BOOL ==> FAIL!!"); //LCOV_EXCL_LINE } @@ -1023,113 +1023,113 @@ static void profile_init(void) _W("VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT ==> FAIL!!"); //LCOV_EXCL_LINE /* add watch for status value */ - ret = vconf_notify_key_changed(VCONFKEY_CALL_STATE, feedback_callstatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_CALL_STATE, feedback_callstatus_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_CALL_STATE failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_CAMERA_STATE, feedback_camerastatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_CAMERA_STATE, feedback_camerastatus_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_CAMERA_STATE failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL, feedback_noti_vibstatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL, feedback_noti_vibstatus_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, feedback_vib_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, feedback_vib_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, feedback_noti_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, feedback_noti_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL, feedback_feedbackstatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL, feedback_feedbackstatus_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL, feedback_vib_when_ring_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL, feedback_vib_when_ring_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, snd_noti_path_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, snd_noti_path_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, snd_call_path_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, snd_call_path_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT, vib_noti_type_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT, vib_noti_type_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, vib_call_type_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, vib_call_type_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, feedback_dnd_mode_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, feedback_dnd_mode_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_THEATER_MODE_ENABLE, feedback_theater_mode_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_THEATER_MODE_ENABLE, feedback_theater_mode_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_THEATER_MODE_ENABLE failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE, feedback_goodnight_mode_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE, feedback_goodnight_mode_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE failed"); //LCOV_EXCL_LINE - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT, feedback_disconnect_alert_mode_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT, feedback_disconnect_alert_mode_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT failed"); //LCOV_EXCL_LINE } static void profile_exit(void) { int prof; - int ret; + int ret_val; prof = get_profile(); if (prof == PROFILE_COMMON) return; else if (prof == PROFILE_MOBILE) { - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, feedback_lock_sndstatus_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, feedback_lock_sndstatus_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_SOUND_LOCK_BOOL failed"); //LCOV_EXCL_LINE } /* remove watch */ - ret = vconf_ignore_key_changed(VCONFKEY_CALL_STATE, feedback_callstatus_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_CALL_STATE, feedback_callstatus_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_CALL_STATE failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_CAMERA_STATE, feedback_camerastatus_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_CAMERA_STATE, feedback_camerastatus_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_CAMERA_STATE failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL, feedback_noti_vibstatus_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL, feedback_noti_vibstatus_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_VIBRATE_WHEN_NOTIFICATION_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, feedback_vib_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, feedback_vib_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, feedback_noti_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, feedback_noti_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL, feedback_feedbackstatus_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL, feedback_feedbackstatus_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_HAPTIC_FEEDBACK_STATUS_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL, feedback_vib_when_ring_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL, feedback_vib_when_ring_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, snd_noti_path_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, snd_noti_path_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, snd_call_path_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, snd_call_path_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT, vib_noti_type_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT, vib_noti_type_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_NOTI_VIBRATION_PATTERN_INT failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, vib_call_type_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, vib_call_type_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, feedback_dnd_mode_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, feedback_dnd_mode_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_THEATER_MODE_ENABLE, feedback_theater_mode_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_THEATER_MODE_ENABLE, feedback_theater_mode_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_THEATER_MODE_ENABLE failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE, feedback_goodnight_mode_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE, feedback_goodnight_mode_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_GOODNIGHT_MODE_ENABLE failed"); //LCOV_EXCL_LINE - ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT, feedback_disconnect_alert_mode_cb); - if (ret != 0) + ret_val = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT, feedback_disconnect_alert_mode_cb); + if (ret_val != 0) _W("Remove watch for VCONFKEY_SETAPPL_DISCONNECT_ALERT_TYPE_INT failed"); //LCOV_EXCL_LINE } @@ -1378,7 +1378,7 @@ static int profile_get_priority(int pattern) static bool mobile_get_always_alert_case(int type, int pattern) { - int ret; + int ret_val; switch (pattern) { case FEEDBACK_PATTERN_KEY0 ... FEEDBACK_PATTERN_KEY_BACK: @@ -1434,8 +1434,8 @@ static bool mobile_get_always_alert_case(int type, int pattern) break; case FEEDBACK_PATTERN_RINGER: if (CHECK_VIBRATION(type) && (is_vibration_mode() || is_sound_mode()) && - vconf_get_int(VCONFKEY_RECORDER_STATE, &ret) == 0 && - ret == VCONFKEY_RECORDER_STATE_RECORDING) + vconf_get_int(VCONFKEY_RECORDER_STATE, &ret_val) == 0 && + ret_val == VCONFKEY_RECORDER_STATE_RECORDING) return true; break; case FEEDBACK_PATTERN_TEMPERATURE_WARNING: @@ -1466,7 +1466,7 @@ static bool wearable_is_system_type(int pattern) static bool wearable_get_always_alert_case(int type, int pattern) { - int ret; + int ret_val; if (CHECK_SOUND(type)) { if ((wearable_is_notification_type(pattern) || wearable_is_system_type(pattern)) && @@ -1599,8 +1599,8 @@ static bool wearable_get_always_alert_case(int type, int pattern) return true; /* check if the state of voice recorder is recording */ if ((is_sound_mode() || is_vibration_mode()) && - vconf_get_int(VCONFKEY_RECORDER_STATE, &ret) == 0 && - ret == VCONFKEY_RECORDER_STATE_RECORDING) { + vconf_get_int(VCONFKEY_RECORDER_STATE, &ret_val) == 0 && + ret_val == VCONFKEY_RECORDER_STATE_RECORDING) { _D("voice recording status is RECORDING"); return true; } @@ -1654,15 +1654,15 @@ static bool profile_get_always_alert_case(int type, int pattern) static bool mobile_get_always_off_case(int type, int pattern) { - int ret; + int ret_val; /* check if the state of voice recorder is recording */ - if (vconf_get_int(VCONFKEY_RECORDER_STATE, &ret) < 0) { + if (vconf_get_int(VCONFKEY_RECORDER_STATE, &ret_val) < 0) { _W("fail to get media sound status, status will be zero"); //LCOV_EXCL_LINE - ret = 0; //LCOV_EXCL_LINE + ret_val = 0; //LCOV_EXCL_LINE } - if (CHECK_SOUND(type) && ret == VCONFKEY_RECORDER_STATE_RECORDING) { + if (CHECK_SOUND(type) && ret_val == VCONFKEY_RECORDER_STATE_RECORDING) { _D("voice recording status is RECORDING"); //LCOV_EXCL_LINE return true; //LCOV_EXCL_LINE } @@ -1695,7 +1695,7 @@ static bool mobile_get_always_off_case(int type, int pattern) //LCOV_EXCL_START static bool wearable_get_always_off_case(int type, int pattern) { - int ret; + int ret_val; if (CHECK_SOUND(type)) { if ((wearable_is_notification_type(pattern) || wearable_is_system_type(pattern)) && @@ -1710,8 +1710,8 @@ static bool wearable_get_always_off_case(int type, int pattern) } /* check if the state of voice recorder is recording */ - if (vconf_get_int(VCONFKEY_RECORDER_STATE, &ret) == 0 && - ret == VCONFKEY_RECORDER_STATE_RECORDING) { + if (vconf_get_int(VCONFKEY_RECORDER_STATE, &ret_val) == 0 && + ret_val == VCONFKEY_RECORDER_STATE_RECORDING) { _D("voice recording status is RECORDING"); return true; } diff --git a/src/feedback.c b/src/feedback.c index 3660d6b..15c763e 100644 --- a/src/feedback.c +++ b/src/feedback.c @@ -61,7 +61,7 @@ static void restart_callback(GDBusConnection *conn, API int feedback_initialize(void) { - int ret; + int ret_dbus; pthread_mutex_lock(&fmutex); if (!profile) { @@ -75,14 +75,14 @@ API int feedback_initialize(void) return FEEDBACK_ERROR_NONE; } - ret = subscribe_dbus_signal(NULL, NULL, + ret_dbus = subscribe_dbus_signal(NULL, NULL, VIBRATOR_INTERFACE_HAPTIC, SIGNAL_VIBRATOR_INITIATED, restart_callback, NULL, NULL); - if (ret <= 0) - _E("Failed to register signal handler. ret=%d", ret); //LCOV_EXCL_LINE System Error + if (ret_dbus <= 0) + _E("Failed to register signal handler. ret=%d", ret_dbus); //LCOV_EXCL_LINE System Error else - signal_id = ret; + signal_id = ret_dbus; /* initialize device */ devices_init(); diff --git a/src/vibrator.c b/src/vibrator.c index 385ef31..319c55d 100644 --- a/src/vibrator.c +++ b/src/vibrator.c @@ -77,35 +77,35 @@ inline int is_vibration_mode(void) static int haptic_open(void) { - int err, ret; - err = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, + int ret_dbus, reply; + ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC, METHOD_OPEN, - g_variant_new("(i)", HAPTIC_DEVICE), &ret); - if (err < 0) - return err; - return ret; + g_variant_new("(i)", HAPTIC_DEVICE), &reply); + if (ret_dbus < 0) + return ret_dbus; + return reply; } static int haptic_close(unsigned int handle) { - int err, ret; - err = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, + int ret_dbus, reply; + ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC, METHOD_CLOSE, - g_variant_new("(u)", handle), &ret); - if (err < 0) - return err; - return ret; + g_variant_new("(u)", handle), &reply); + if (ret_dbus < 0) + return ret_dbus; + return reply; } static int haptic_is_supported(const char *pattern) { - int err, ret; - err = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, + int ret_dbus, reply; + ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC, METHOD_IS_SUPPORTED, - g_variant_new("(s)", pattern), &ret); - if (err < 0) - return err; - return ret; + g_variant_new("(s)", pattern), &reply); + if (ret_dbus < 0) + return ret_dbus; + return reply; } static int haptic_vibrate_effect(unsigned int handle, @@ -113,24 +113,24 @@ static int haptic_vibrate_effect(unsigned int handle, int feedback, int priority) { - int err, ret; - err = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, + int ret_dbus, reply; + ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC, METHOD_VIBRATE_PATTERN, - g_variant_new("(usii)", handle, pattern, feedback, priority), &ret); - if (err < 0) - return err; - return ret; + g_variant_new("(usii)", handle, pattern, feedback, priority), &reply); + if (ret_dbus < 0) + return ret_dbus; + return reply; } static int haptic_vibrate_stop(unsigned int handle) { - int err, ret; - return dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, + int ret_dbus, reply; + ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME, VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC, METHOD_STOP, - g_variant_new("(u)", handle), &ret); - if (err < 0) - return err; - return ret; + g_variant_new("(u)", handle), &reply); + if (ret_dbus < 0) + return ret_dbus; + return reply; } static int get_priority(feedback_pattern_e pattern) @@ -148,36 +148,36 @@ static void feedback_vibstatus_cb(keynode_t *key, void* data) static void vibrator_init(void) { - int ret; + int ret_val; bool haptic_avail; - ret = system_info_get_platform_bool(VIBRATION_FEATURE, &haptic_avail); - if (ret < 0) { //LCOV_EXCL_LINE + ret_val = system_info_get_platform_bool(VIBRATION_FEATURE, &haptic_avail); + if (ret_val < 0) { //LCOV_EXCL_LINE v_handle = -ENOTSUP; //LCOV_EXCL_LINE return; //LCOV_EXCL_LINE - } else if (ret == 0 && !haptic_avail) { + } else if (ret_val == 0 && !haptic_avail) { v_handle = -ENOTSUP; //LCOV_EXCL_LINE return; //LCOV_EXCL_LINE } /* Vibration Init */ - ret = haptic_open(); - if (ret == -EACCES || ret == -ECOMM || ret == -EPERM) { - _E("haptic_open ==> FAIL!! : %d", ret); //LCOV_EXCL_LINE + ret_val = haptic_open(); + if (ret_val == -EACCES || ret_val == -ECOMM || ret_val == -EPERM) { + _E("haptic_open ==> FAIL!! : %d", ret_val); //LCOV_EXCL_LINE v_handle = -EACCES; //LCOV_EXCL_LINE System Error return; //LCOV_EXCL_LINE System Error } - if (ret < 0) { - _E("haptic_open ==> FAIL!! : %d", ret); //LCOV_EXCL_LINE + if (ret_val < 0) { + _E("haptic_open ==> FAIL!! : %d", ret_val); //LCOV_EXCL_LINE v_handle = -ENOTSUP; //LCOV_EXCL_LINE System Error return; //LCOV_EXCL_LINE System Error } /* Set vibration handle */ - v_handle = (unsigned int)ret; + v_handle = (unsigned int)ret_val; - ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, feedback_vibstatus_cb, NULL); - if (ret != 0) + ret_val = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, feedback_vibstatus_cb, NULL); + if (ret_val != 0) _W("Add watch for VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL failed"); //LCOV_EXCL_LINE }