X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-interface%2Fsrc%2Fzigbee_service_interface_common.c;h=e967880cb6c5f9654899fce8d8d8ab6cd3aefe04;hb=b5e80cc6e74dce8530f14650f1de01402dfbd687;hp=1c0a2bfaec3a8b7616ae38359e6eb739430bfe25;hpb=73f51f75b214ec0021f4a6ee84824709b58761cc;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.c
index 1c0a2bf..e967880 100644
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.c
@@ -72,19 +72,15 @@ void zigbee_service_dbus_interface_destroy_resp_cb_data(ZigbeeServiceInterfaceRe
 
 void *zigbee_service_dbus_interface_ref_interface_object(ZigbeeServiceInterfaceRespCbData_t *resp_cb_data)
 {
-	if (resp_cb_data)
-		return resp_cb_data->interface_object;
-
-	return NULL;
+	zblib_check_null_ret_error("resp_cb_data", resp_cb_data, NULL);
+	return resp_cb_data->interface_object;
 }
 
 GDBusMethodInvocation *
 zigbee_service_dbus_interface_ref_invocation(ZigbeeServiceInterfaceRespCbData_t *resp_cb_data)
 {
-	if (resp_cb_data)
-		return resp_cb_data->invocation;
-
-	return NULL;
+	zblib_check_null_ret_error("resp_cb_data", resp_cb_data, NULL);
+	return resp_cb_data->invocation;
 }
 
 gboolean zigbee_service_dbus_interface_dispatch_request(ZigBeeServiceInterface *service_interface,