Remove NULL check for callback parameter

The void *data used as callback parameter,
it can be NULL depending on the callback function logic.
Thus, the checking of data parameter is unnecessary and should be removed
for proper operation.
To avoid confusion with the name of the callback parameter called "data",
it was changed from "data" to "user_data".

Change-Id: I92bf8bb7dda251df52c23d1b12a101d3ecb7137d
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>

diff --git a/include/hal-device-battery.h b/include/hal-device-battery.h
index 5b1421bfb368a0560901e2665028afb25c070cde..b71563870ae8a05cddf7db6f243a1e0a1d28c02b 100644 (file)
--- a/include/hal-device-battery.h
+++ b/include/hal-device-battery.h
@@ -26,9 +26,9 @@ extern "C" {
 
 int hal_device_battery_get_backend(void);
 int hal_device_battery_put_backend(void);
-int hal_device_battery_register_changed_event(hal_device_battery_updated_cb updated_cb, void *data);
+int hal_device_battery_register_changed_event(hal_device_battery_updated_cb updated_cb, void *user_data);
 int hal_device_battery_unregister_changed_event(hal_device_battery_updated_cb updated_cb);
-int hal_device_battery_get_current_state(hal_device_battery_updated_cb updated_cb, void *data);
+int hal_device_battery_get_current_state(hal_device_battery_updated_cb updated_cb, void *user_data);
 int hal_device_battery_get_power_source_name(hal_device_battery_power_source_type_e power_source_type, const char **power_source);
 int hal_device_battery_get_power_source_type(char *power_source, hal_device_battery_power_source_type_e *power_source_type);
 

diff --git a/include/hal-device-external_connection-interface-1.h b/include/hal-device-external_connection-interface-1.h
index 59cb6616bed41362592a8b289e12a87a5cabf680..cd9f93944899b918ea02681bafc0a0fae83ae3a7 100644 (file)
--- a/include/hal-device-external_connection-interface-1.h
+++ b/include/hal-device-external_connection-interface-1.h
@@ -26,11 +26,11 @@ extern "C" {
 
 typedef struct _hal_backend_device_external_connection_funcs {
        /* Register external_connection event */
-       int (*register_changed_event)(hal_device_external_connection_updated_cb updated_cb, void *data);
+       int (*register_changed_event)(hal_device_external_connection_updated_cb updated_cb, void *user_data);
        void (*unregister_changed_event)(hal_device_external_connection_updated_cb updated_cb);
 
        /* Get current states */
-       int (*get_current_state)(hal_device_external_connection_updated_cb updated_cb, void *data);
+       int (*get_current_state)(hal_device_external_connection_updated_cb updated_cb, void *user_data);
 } hal_backend_device_external_connection_funcs;
 
 #ifdef __cplusplus

diff --git a/include/hal-device-thermal-interface-1.h b/include/hal-device-thermal-interface-1.h
index e996466f041a9e6a52babf42b9f6bf579f135c80..8919abe03dffe5370cb4f7260fe64e0f023a39a3 100644 (file)
--- a/include/hal-device-thermal-interface-1.h
+++ b/include/hal-device-thermal-interface-1.h
@@ -29,7 +29,7 @@ typedef struct _hal_backend_device_thermal_funcs {
        int (*get_info)(hal_device_thermal_e type, hal_device_thermal_info_s *info);
 
        /* Register thermal event */
-       int (*register_changed_event)(hal_device_thermal_updated_cb updated_cb, void *data);
+       int (*register_changed_event)(hal_device_thermal_updated_cb updated_cb, void *user_data);
        int (*unregister_changed_event)(hal_device_thermal_updated_cb updated_cb);
 } hal_backend_device_thermal_funcs;
 

diff --git a/src/hal-api-device-external_connection.c b/src/hal-api-device-external_connection.c
index 99b4c99d358356ada10828cea8be46ca94869906..6316bcb4fa18e30eeaf4b09dec73a17ed0168015 100644 (file)
--- a/src/hal-api-device-external_connection.c
+++ b/src/hal-api-device-external_connection.c
@@ -65,11 +65,11 @@ int hal_device_external_connection_put_backend(void)
 }
 
 
-int hal_device_external_connection_register_changed_event(hal_device_external_connection_updated_cb updated_cb, void *data)
+int hal_device_external_connection_register_changed_event(hal_device_external_connection_updated_cb updated_cb, void *user_data)
 {
        int ret;
 
-       if (!updated_cb || !data)
+       if (!updated_cb)
                return -EINVAL;
 
        if (!hal_device_external_connection_funcs) {
@@ -81,7 +81,7 @@ int hal_device_external_connection_register_changed_event(hal_device_external_co
                !hal_device_external_connection_funcs->register_changed_event)
                return -ENOTSUP;
 
-       return hal_device_external_connection_funcs->register_changed_event(updated_cb, data);
+       return hal_device_external_connection_funcs->register_changed_event(updated_cb, user_data);
 }
 
 int hal_device_external_connection_unregister_changed_event(hal_device_external_connection_updated_cb updated_cb)
@@ -104,11 +104,11 @@ int hal_device_external_connection_unregister_changed_event(hal_device_external_
        return 0;
 }
 
-int hal_device_external_connection_get_current_state(hal_device_external_connection_updated_cb updated_cb, void *data)
+int hal_device_external_connection_get_current_state(hal_device_external_connection_updated_cb updated_cb, void *user_data)
 {
        int ret;
 
-       if (!updated_cb || !data)
+       if (!updated_cb)
                return -EINVAL;
 
        if (!hal_device_external_connection_funcs) {
@@ -120,7 +120,7 @@ int hal_device_external_connection_get_current_state(hal_device_external_connect
                !hal_device_external_connection_funcs->get_current_state)
                return -ENOTSUP;
 
-       return hal_device_external_connection_funcs->get_current_state(updated_cb, data);
+       return hal_device_external_connection_funcs->get_current_state(updated_cb, user_data);
 }
 
 int hal_device_external_connection_get_device_name(hal_device_external_connection_device_type_e deivce_type, const char **device_name)

diff --git a/src/hal-api-device-thermal.c b/src/hal-api-device-thermal.c
index 5b630381dd6d88a50f1d5c8a10f1bbbb0e683d1c..945a6f544acf97bd77fce423567709d3483fd7ae 100644 (file)
--- a/src/hal-api-device-thermal.c
+++ b/src/hal-api-device-thermal.c
@@ -82,11 +82,11 @@ int hal_device_thermal_get_info(hal_device_thermal_e type, hal_device_thermal_in
        return hal_device_thermal_funcs->get_info(type, info);
 }
 
-int hal_device_thermal_register_changed_event(hal_device_thermal_updated_cb updated_cb, void *data)
+int hal_device_thermal_register_changed_event(hal_device_thermal_updated_cb updated_cb, void *user_data)
 {
        int ret;
 
-       if (!updated_cb || !data)
+       if (!updated_cb)
                return -EINVAL;
 
        if (!hal_device_thermal_funcs) {
@@ -98,7 +98,7 @@ int hal_device_thermal_register_changed_event(hal_device_thermal_updated_cb upda
                !hal_device_thermal_funcs->register_changed_event)
                return -ENOTSUP;
 
-       return hal_device_thermal_funcs->register_changed_event(updated_cb, data);
+       return hal_device_thermal_funcs->register_changed_event(updated_cb, user_data);
 }
 
 int hal_device_thermal_unregister_changed_event(hal_device_thermal_updated_cb updated_cb)