Remove unnecessary NULL checks

Change-Id: I9cf076700e0dd68eeed2600cabb931819cb709fc
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/ua-daemon/src/pm/ua-pm-util.c b/ua-daemon/src/pm/ua-pm-util.c
index 87aa89e..f2f12f8 100644 (file)
--- a/ua-daemon/src/pm/ua-pm-util.c
+++ b/ua-daemon/src/pm/ua-pm-util.c
@@ -252,7 +252,7 @@ uas_device_info_t *_pm_util_uam_dev_info_to_uas_dev_info(const uam_device_info_s
        device->payload->purpose = dev->payload.purpose;
        device->payload->device_icon = dev->payload.device_icon;
        device->payload->duid = g_memdup(&(dev->payload.duid), UAM_BLE_PAYLOAD_DUID_LEN);
-       device->payload->bt_mac = g_memdup(&(dev->payload.bt_mac), UAM_BLE_PAYLOAD_DUID_LEN);
+       device->payload->bt_mac = g_memdup(&(dev->payload.bt_mac), UAM_BT_MAC_ADDRESS_STRING_LEN);
 
        device->addr_list = g_new0(uas_address_info_t, device->num_addr);
        if (mac) {
@@ -287,12 +287,9 @@ uam_device_info_s *_pm_util_uas_dev_info_to_uam_dev_info(const uas_device_info_t
        memset(device->payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
        memset(device->payload.bt_mac, 0, UAM_BT_MAC_ADDRESS_STRING_LEN);
        if (dev->payload) {
-               if (dev->payload->service_id)
-                       device->payload.service_id = dev->payload->service_id;
-               if (dev->payload->device_icon)
-                       device->payload.device_icon = dev->payload->device_icon;
-               if (dev->payload->purpose)
-                       device->payload.purpose = dev->payload->purpose;
+               device->payload.service_id = dev->payload->service_id;
+               device->payload.device_icon = dev->payload->device_icon;
+               device->payload.purpose = dev->payload->purpose;
                if (dev->payload->duid)
                        memcpy(device->payload.duid, dev->payload->duid, UAM_BLE_PAYLOAD_DUID_LEN);
                if (dev->payload->bt_mac)

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index 88de07a..e5e6e9f 100644 (file)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -459,12 +459,9 @@ static void __get_uam_db_dev_list_to_uam_dev_list(
                        memset((*device_list)[indx].payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
                        memset((*device_list)[indx].payload.bt_mac, 0, UAM_BT_MAC_ADDRESS_STRING_LEN);
                        if (tech->payload) {
-                               if (tech->payload->service_id)
-                                       (*device_list)[indx].payload.service_id = tech->payload->service_id;
-                               if (tech->payload->device_icon)
-                                       (*device_list)[indx].payload.device_icon = tech->payload->device_icon;
-                               if (tech->payload->purpose)
-                                       (*device_list)[indx].payload.purpose = tech->payload->purpose;
+                               (*device_list)[indx].payload.service_id = tech->payload->service_id;
+                               (*device_list)[indx].payload.device_icon = tech->payload->device_icon;
+                               (*device_list)[indx].payload.purpose = tech->payload->purpose;
                                if (tech->payload->duid)
                                        memcpy((*device_list)[indx].payload.duid,
                                        tech->payload->duid, UAM_BLE_PAYLOAD_DUID_LEN);
@@ -525,14 +522,11 @@ static int __copy_tech_info_to_device_info(uam_db_tech_info_t *tech, uam_device_
        device->type = tech->tech_type;
        device->discriminant = tech->discriminant;
        memset(device->payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
-       memset(device->payload.bt_mac, 0, UAM_BT_MAC_ADDRESS_STRING_LEN + 1);
+       memset(device->payload.bt_mac, 0, UAM_BT_MAC_ADDRESS_STRING_LEN);
        if (tech->payload) {
-               if (tech->payload->service_id)
-                       device->payload.service_id = tech->payload->service_id;
-               if (tech->payload->device_icon)
-                       device->payload.device_icon = tech->payload->device_icon;
-               if (tech->payload->purpose)
-                       device->payload.purpose = tech->payload->purpose;
+               device->payload.service_id = tech->payload->service_id;
+               device->payload.device_icon = tech->payload->device_icon;
+               device->payload.purpose = tech->payload->purpose;
                if (tech->payload->duid)
                        memcpy(device->payload.duid,
                        tech->payload->duid, UAM_BLE_PAYLOAD_DUID_LEN);