[Non-ACR] removed un-necessary conditions

Change-Id: Iad4b56c7934235945fa32a49e15aea4b91c253ff
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/include/bm_common.h b/include/bm_common.h
index d2126b6d6aaab43df51df84cb864f446a21a20c6..69c1edc709faa2869fc07786e26d3f2b8495d2d5 100644 (file)
--- a/include/bm_common.h
+++ b/include/bm_common.h
@@ -110,6 +110,15 @@ typedef enum {
 #define BM_RID_GPS                             BATTERY_MONITOR_GPS_DATA_ID
 #define BM_RID_BAT                             BATTERY_MONITOR_BATTERY_DATA_ID
 
+/* battery-dump listener macro */
+#define DBUS_DEVICED                           "org.tizen.system.deviced"
+#define DBUS_DEVICED_PATH                      "/Org/Tizen/System/DeviceD/Display"
+#define DBUS_DEVICED_IFACE                     "org.tizen.system.deviced.display"
+#define DBUS_DEVICED_PL_MEMBER                 "PowerLock"
+#define DBUS_DEVICED_PU_MEMBER                 "PowerUnlock"
+#define DBUS_DEVICED_SLEEP_MEMBER              "sleep"
+#define DBUS_DEVICED_WAKEUP_MEMBER             "wakeup"
+
 /* Pre-defined App ID */
 #define BM_APPID_SYSTEM        "Tizen"
 

diff --git a/src/battery_dump/bm_listeners.c b/src/battery_dump/bm_listeners.c
index 7db08dbc8d9064d32d8c9c36c505d796089278ac..678c9062599e21b8bf8a9524fd81580d32fd4f3e 100644 (file)
--- a/src/battery_dump/bm_listeners.c
+++ b/src/battery_dump/bm_listeners.c
@@ -15,11 +15,6 @@
  *
  */
 
-#include "bm_listeners.h"
-#include "bm_dbg.h"
-#include <bm_common.h>
-#include <bm_util.h>
-#include <bd_history_item.h>
 #include <vconf.h>
 #include <pthread.h>
 #include <sys/time.h>
@@ -27,6 +22,11 @@
 #include <ITapiNetwork.h>
 #include <glib.h>
 #include <device/battery-internal.h>
+#include "bm_listeners.h"
+#include "bm_dbg.h"
+#include "bm_common.h"
+#include "bm_util.h"
+#include "bd_history_item.h"
 
 wifi_manager_h wifi = NULL;
 struct timeval prev_event_time;
@@ -48,14 +48,6 @@ static int buff_count = 0;
 
 GHashTable *app_list = NULL;
 
-#define DBUS_DEVICED                   "org.tizen.system.deviced"
-#define DBUS_DEVICED_PATH              "/Org/Tizen/System/DeviceD/Display"
-#define DBUS_DEVICED_IFACE             "org.tizen.system.deviced.display"
-#define DBUS_DEVICED_PL_MEMBER         "PowerLock"
-#define DBUS_DEVICED_PU_MEMBER         "PowerUnlock"
-#define DBUS_DEVICED_SLEEP_MEMBER      "sleep"
-#define DBUS_DEVICED_WAKEUP_MEMBER     "wakeup"
-
 static int bd_listener_set_appId_info(char *app_id)
 {
        ENTER;
@@ -77,57 +69,58 @@ static int bd_listener_set_battery_info()
        ENTER;
 
        struct device_battery_info info;
+
        int ret = device_battery_get_info_direct(&info);
+
        if (ret == DEVICE_ERROR_NONE) {
                data_obj->battery_level = info.capacity;
                if (data_obj->battery_level < 0)
                        _ERR("Failed to get  ts->battery_level = %d ", data_obj->battery_level);
 
-               size_t len = strlen(info.status);
-               if (!strncmp(info.status, "Charging", len))
+               if (!g_strcmp0(info.status, "Charging"))
                        data_obj->battery_status = BD_BSTA_CHAR;
-               else if (!strncmp(info.status, "Discharging", len))
+               else if (!g_strcmp0(info.status, "Discharging"))
                        data_obj->battery_status = BD_BSTA_DISC;
-               else if (!strncmp(info.status, "Full", len))
+               else if (!g_strcmp0(info.status, "Full"))
                        data_obj->battery_status = BD_BSTA_FULL;
-               else if (!strncmp(info.status, "Not charging", len))
+               else if (!g_strcmp0(info.status, "Not charging"))
                        data_obj->battery_status = BD_BSTA_NCHA;
                else {
                        _ERR("Failed to get info.status = %s ", info.status);
                        data_obj->battery_status = BD_BSTA_UNKN;
                }
 
-               len = strlen(info.health);
-               if (!strncmp(info.health, "Good", len))
+               if (!g_strcmp0(info.health, "Good"))
                        data_obj->battery_health = BD_BHLT_GOOD;
-               else if (!strncmp(info.health, "Cold", len))
+               else if (!g_strcmp0(info.health, "Cold"))
                        data_obj->battery_health = BD_BHLT_CLD;
-               else if (!strncmp(info.health, "Dead", len))
+               else if (!g_strcmp0(info.health, "Dead"))
                        data_obj->battery_health = BD_BHLT_DEAD;
-               else if (!strncmp(info.health, "Overheat", len))
+               else if (!g_strcmp0(info.health, "Overheat"))
                        data_obj->battery_health = BD_BHLT_OVRH;
-               else if (!strncmp(info.health, "Over voltage", len))
+               else if (!g_strcmp0(info.health, "Over voltage"))
                        data_obj->battery_health = BD_BHLT_OVRV;
                else
                        data_obj->battery_health = BD_BHLT_UNKN;
 
-               len = strlen(info.power_source);
-               if (!strncmp(info.power_source, "ac", len))
+               if (!g_strcmp0(info.power_source, "ac"))
                        data_obj->battery_plugtype = BD_BPLT_AC;
-               else if (!strncmp(info.power_source, "usb", len))
+               else if (!g_strcmp0(info.power_source, "usb"))
                        data_obj->battery_plugtype = BD_BPLT_USB;
-               else if (!strncmp(info.power_source, "wireless", len))
+               else if (!g_strcmp0(info.power_source, "wireless"))
                        data_obj->battery_plugtype = BD_BPLT_WL;
                else
                        data_obj->battery_plugtype = BD_BPLT_NONE;
 
-               _INFO("battery_level = %d, battery_status = %d, battery_health = %d, battery_plugtype = %d",
-                       data_obj->battery_level, data_obj->battery_status, data_obj->battery_health, data_obj->battery_plugtype);
+               _INFO("battery_level = %d, battery_status = %d, battery_health = %d, \
+                       battery_plugtype = %d", data_obj->battery_level, data_obj->battery_status, \
+                               data_obj->battery_health, data_obj->battery_plugtype);
 
                data_obj->battery_temperature = info.temperature;
                data_obj->battery_voltage = info.voltage_now;
 
-               _INFO("battery_voltage = %d, battery_temperature = %d", data_obj->battery_voltage, data_obj->battery_temperature);
+               _INFO("battery_voltage = %d, battery_temperature = %d", \
+                       data_obj->battery_voltage, data_obj->battery_temperature);
        } else {
                _ERR("Failed to get battery info (%d)", ret);
        }
@@ -1636,13 +1629,8 @@ static void _bd_listener_powerlock_signal_cb(GDBusConnection *conn,
        return;
 }
 
-static void _bd_listener_powerunlock_signal_cb(GDBusConnection *conn,
-               const gchar *sender,
-               const gchar *path,
-               const gchar *iface,
-               const gchar *signal,
-               GVariant *params,
-               gpointer user_data)
+static void _bd_listener_powerunlock_signal_cb(GDBusConnection *conn, const gchar *sender, const gchar *path,
+                       const gchar *iface, const gchar *signal, GVariant *params, gpointer user_data)
 {
        ENTER;
        pid_t pid;
@@ -1659,13 +1647,8 @@ static void _bd_listener_powerunlock_signal_cb(GDBusConnection *conn,
        return;
 }
 
-static void _bd_listener_sleep_signal_cb(GDBusConnection *conn,
-               const gchar *sender,
-               const gchar *path,
-               const gchar *iface,
-               const gchar *signal,
-               GVariant *params,
-               gpointer user_data)
+static void _bd_listener_sleep_signal_cb(GDBusConnection *conn, const gchar *sender, const gchar *path,
+                       const gchar *iface, const gchar *signal, GVariant *params, gpointer user_data)
 {
        ENTER;
 
@@ -1683,13 +1666,8 @@ static void _bd_listener_sleep_signal_cb(GDBusConnection *conn,
        return;
 }
 
-static void _bd_listener_wakeup_signal_cb(GDBusConnection *conn,
-               const gchar *sender,
-               const gchar *path,
-               const gchar *iface,
-               const gchar *signal,
-               GVariant *params,
-               gpointer user_data)
+static void _bd_listener_wakeup_signal_cb(GDBusConnection *conn, const gchar *sender, const gchar *path,
+               const gchar *iface, const gchar *signal, GVariant *params, gpointer user_data)
 {
        ENTER;
 
@@ -1707,13 +1685,8 @@ static void _bd_listener_wakeup_signal_cb(GDBusConnection *conn,
        return;
 }
 
-static void _bd_listener_app_status_signal_cb(GDBusConnection *conn,
-               const gchar *sender,
-               const gchar *path,
-               const gchar *iface,
-               const gchar *signal,
-               GVariant *params,
-               gpointer user_data)
+static void _bd_listener_app_status_signal_cb(GDBusConnection *conn, const gchar *sender, const gchar *path,
+                       const gchar *iface, const gchar *signal, GVariant *params, gpointer user_data)
 {
        ENTER;
        int pid, val;
@@ -1759,9 +1732,9 @@ static int  bd_subscribe_charging_status_listeners()
        ENTER;
 
        /* Charging callbacks */
-       int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _bd_listener_charging_status_change, NULL);
-       if (ret != 0) {
-               _ERR("failed to register a cb key:%s err:%d", "VCONFKEY_SYSMAN_CHARGER_STATUS", ret);
+       if (vconf_notify_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS,
+                                       _bd_listener_charging_status_change, NULL) != 0) {
+               _ERR("failed to register cb key:%s", "VCONFKEY_SYSMAN_CHARGER_STATUS");
                return 1;
        }
 
@@ -1774,9 +1747,9 @@ static int  bd_subscribe_battery_capacity_listeners()
        ENTER;
 
        /* Charging callbacks */
-       int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, _bd_listener_battery_capacity_change, NULL);
-       if (ret != 0) {
-               _ERR("failed to register a cb key:%s err:%d", "VCONFKEY_SYSMAN_BATTERY_CAPACITY", ret);
+       if (vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY,
+                                       _bd_listener_battery_capacity_change, NULL) != 0) {
+               _ERR("failed to register cb key:%s", "VCONFKEY_SYSMAN_BATTERY_CAPACITY");
                return 1;
        }
 
@@ -1789,10 +1762,9 @@ static int  bd_subscribe_location_listeners()
        ENTER;
 
        /* Charging callbacks */
-       int ret = 0;
-       ret = vconf_notify_key_changed(VCONFKEY_LOCATION_ENABLED, _bd_listener_location_change, NULL);
-       if (ret != 0) {
-               _ERR("failed to register a cb key:%s err:%d", "VCONFKEY_LOCATION_ENABLED", ret);
+       if (vconf_notify_key_changed(VCONFKEY_LOCATION_ENABLED,
+                                       _bd_listener_location_change, NULL) != 0) {
+               _ERR("failed to register cb key:%s", "VCONFKEY_LOCATION_ENABLED");
                return 1;
        }
 
@@ -1805,9 +1777,9 @@ static int  bd_subscribe_screen_listeners()
        ENTER;
 
        /* Screen callbacks */
-       int ret = device_add_callback(DEVICE_CALLBACK_DISPLAY_STATE, _bd_listener_device_display_change, NULL);
-       if (ret != BATTERY_MONITOR_ERROR_NONE) {
-               _ERR("device_add_callback failed: %s", get_error_message(ret));
+       if (device_add_callback(DEVICE_CALLBACK_DISPLAY_STATE,
+                       _bd_listener_device_display_change, NULL) != BATTERY_MONITOR_ERROR_NONE) {
+               _ERR("failed to add cb for display-state");
                return 1;
        }
 
@@ -2063,12 +2035,11 @@ int bd_initialize_listeners(void)
 
        listener_hsp = -1;
 
-       /* Initialize Hash Table */
-       if (!bd_initialize_data_items())
-               _INFO("bd_initialize_data_items() success");
-       else {
+       /* initialize data items */
+       int ret = bd_initialize_data_items();
+       if (ret != BATTERY_MONITOR_ERROR_NONE) {
                _ERR("bd_initialize_data_items() failed");
-               return BATTERY_MONITOR_ERROR_OUT_OF_MEMORY;
+               return ret;
        }
 
        /* Initialize pthread attributes */
@@ -2081,69 +2052,47 @@ int bd_initialize_listeners(void)
                _ERR("pthread_attr_setdetachstate failed");
 
        /*  Wifi callbacks */
-       if (!bd_subscribe_wifi_listeners())
-               _INFO("Wifi listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_wifi_listeners())
                _ERR("Wifi listeners failed to subscribed\n");
 
        /*  BlueTooth callbacks */
-       if (!bd_subscribe_bluetooth_listeners())
-               _INFO("bluetooth listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_bluetooth_listeners())
                _ERR("bluetooth listeners failed to subscribed\n");
 
        /*  Screen wakeup callbacks */
-       if (!bd_subscribe_screen_listeners())
-               _INFO("Display listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_screen_listeners())
                _ERR("Display listeners failed to subscribed\n");
 
        /* Brightness change callbacks */
-       if (!bd_subscribe_display_brightness_listeners())
-               _INFO("Brightness listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_display_brightness_listeners())
                _ERR("Brightness listeners failed to subscribed\n");
 
        /* battery_capacity change callbacks */
-       if (!bd_subscribe_battery_capacity_listeners())
-               _INFO("battery_capacity listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_battery_capacity_listeners())
                _ERR("battery_capacity listeners failed to subscribed\n");
 
        /* battery charging change callbacks */
-       if (!bd_subscribe_charging_status_listeners())
-               _INFO("battery charging listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_charging_status_listeners())
                _ERR("battery charging listeners failed to subscribed\n");
 
        /* GPS change callbacks */
-       if (!bd_subscribe_location_listeners())
-               _INFO("location listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_location_listeners())
                _ERR("location listeners failed to subscribed\n");
 
        /* telephony listeners */
-       if (!bd_subscribe_telephony_listeners())
-               _INFO("telephony listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_telephony_listeners())
                _ERR("telephony  listeners failed to subscribed\n");
 
        /* Powerlock callbacks */
-       if (!bd_subscribe_powerlock_unlock_listener())
-               _INFO("Pwoerlock listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_powerlock_unlock_listener())
                _ERR("Powerlock listeners failed to subscribed\n");
 
        /* Device Sleep callbacks */
-       if (!bd_subscribe_sleep_wakeup_listener())
-               _INFO("Sleep Wakeup listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_sleep_wakeup_listener())
                _ERR("Sleep Wakeup listeners failed to subscribed\n");
 
        /* App Status callbacks */
-       if (!bd_subscribe_app_status_listener())
-               _INFO("FG listeners succeeded to subscribed\n");
-       else
+       if (bd_subscribe_app_status_listener())
                _ERR("FG Wakeup listeners failed to subscribed\n");
 
        EXIT;
@@ -2156,46 +2105,35 @@ int bd_deinitialize_listeners()
 
        _INFO("de-initializing History listeners");
 
-       /* Wi-Fi */
-       /*unset the callbacks related to wifi*/
+       /* unset the callbacks related to wifi */
        if (wifi_manager_unset_connection_state_changed_cb(wifi) != WIFI_MANAGER_ERROR_NONE)
                _ERR("wifi_manager_unset_connection_state_changed_cb() failed.\n");
-       else
-               _INFO("wifi_manager_unset_connection_state_changed_cb() success.\n");
 
+       /* wifi deinitialization*/
        if (wifi_manager_deinitialize(wifi) != WIFI_MANAGER_ERROR_NONE)
                _ERR("wifi_manager_deinitialize() failed.\n");
-       else
-               _INFO("wifi_manager_deinitialize() success.\n");
 
-       /* Bluetooth */
        /* unset bluetooth device connection state changed state event callback*/
        if (bt_device_unset_connection_state_changed_cb() != BT_ERROR_NONE)
                _ERR("bt_device_unset_connection_state_changed_cb() failed.\n");
-       else
-               _INFO("bt_device_unset_connection_state_changed_cb() success.\n");
 
        /* unset bluetooth adapter changed state event callback*/
        if (bt_adapter_unset_state_changed_cb() != BT_ERROR_NONE)
                _ERR("bt_adapter_unset_state_changed_cb() failed.\n");
-       else
-               _INFO("bt_adapter_unset_state_changed_cb() success.\n");
 
        /* deinit bluetooth api*/
        if (bt_deinitialize() != BT_ERROR_NONE)
                _ERR("bt_deinitialize() failed.\n");
-       else
-               _INFO("bt_deinitialize() success.\n");
 
-       //Brightness
+       /* brightness vconf-key */
        if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, _bd_listener_display_brightness_change) < 0)
                _ERR("failed to de-register vconf callback");
 
-       //Battery capacity
+       /* battery capacity vconf-key */
        if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, _bd_listener_battery_capacity_change) < 0)
                _ERR("failed to de-register vconf callback");
 
-       //Battery charging
+       /* Battery charging vconf-key */
        if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _bd_listener_charging_status_change) < 0)
                _ERR("failed to de-register vconf callback");
 
@@ -2204,28 +2142,25 @@ int bd_deinitialize_listeners()
                int ret = tel_deregister_noti_event(handle, TAPI_NOTI_NETWORK_SIGNALSTRENGTH);
                if (ret != BATTERY_MONITOR_ERROR_NONE) {
                        _ERR("tel_deregister_noti_event failed: %s", get_error_message(ret));
-                       return 1;
+                       return ret;
                }
+
                ret = tel_deregister_noti_event(handle, TAPI_NOTI_MODEM_POWER);
                if (ret != BATTERY_MONITOR_ERROR_NONE) {
                        _ERR("tel_deregister_noti_event failed: %s", get_error_message(ret));
-                       return 1;
+                       return ret;
                }
                tel_deinit(handle);
        }
 
-       /*Dbus Deinitialize*
-       if (bm_listener_dbus_deinit())
-               _ERR("failed to de-init dbus "); */
-
        /* de-initialize pthread attributes */
        if (pthread_attr_destroy(&attr) != 0)
                _ERR("pthread_attr_destroy failed");
 
        g_hash_table_destroy(app_list);
 
-       if (data_obj)
-               BM_FREE(data_obj);
+       /* TODO - check about internal struct members */
+       BM_FREE(data_obj);
 
        EXIT;
        return BATTERY_MONITOR_ERROR_NONE;