Modify the API name for seting callback

ua_monitor_set_sensor_status_cb
=> ua_monitor_set_sensor_status_changed_cb

ua_monitor_set_sensor_status_cb
=> ua_monitor_set_sensor_status_changed_cb

Change-Id: I6842b1a8316d762990364da7d71b905dd2ff86cc
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>

diff --git a/include/user-awareness-type.h b/include/user-awareness-type.h
index 3face28bdcd95b91f1f7add4c8a7ce3d37c8936e..ce022c19bb827828be9bc3805ee3e978ea391b31 100755 (executable)
--- a/include/user-awareness-type.h
+++ b/include/user-awareness-type.h
@@ -257,7 +257,7 @@ typedef void *ua_device_h;
  * @param[in] sensor The list of sensor handles on which user is not detected.
  * @param[in] sensor_type The type of sensor detected.
  * @param[in] report The status report of sensor detected.
- * @param[in] user_data The user data passed in ua_monitor_set_sensor_status_cb().
+ * @param[in] user_data The user data passed in ua_monitor_set_sensor_status_changed_cb().
  *
  */
 typedef void (*ua_sensor_status_changed_cb)(

diff --git a/include/user-awareness.h b/include/user-awareness.h
index 4f7ffc507c53ce7d56d1a883a7a5f7943c7fc377..2e4e7f0aa8ba39cc72bae69319bba7b5050e1a32 100755 (executable)
--- a/include/user-awareness.h
+++ b/include/user-awareness.h
@@ -288,7 +288,7 @@ int ua_monitor_is_sensor_available(
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
  *
  */
-int ua_monitor_set_sensor_status_cb(
+int ua_monitor_set_sensor_status_changed_cb(
                ua_monitor_h monitor,
                ua_sensor_status_changed_cb callback,
                void *user_data);
@@ -305,9 +305,9 @@ int ua_monitor_set_sensor_status_cb(
  * @retval #UA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #UA_ERROR_NOT_INITIALIZED Not initialized yet
  *
- * @see ua_monitor_set_sensor_status_cb()
+ * @see ua_monitor_set_sensor_status_changed_cb()
  */
-int ua_monitor_unset_sensor_status_cb(
+int ua_monitor_unset_sensor_status_changed_cb(
                ua_monitor_h monitor);
 
 /**

diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c
index 2b4a6496330b388a7b2188401dd55ad2a04c3908..b5d58a3069df6e86ceb3a3a2222f86ddd4fa93bd 100755 (executable)
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -1250,7 +1250,7 @@ int ua_monitor_set_user_absence_condition(
        return UA_ERROR_NONE;
 }
 
-int ua_monitor_set_sensor_status_cb(ua_monitor_h handle,
+int ua_monitor_set_sensor_status_changed_cb(ua_monitor_h handle,
                ua_sensor_status_changed_cb callback, void *user_data)
 {
        FUNC_ENTRY;
@@ -1269,7 +1269,7 @@ int ua_monitor_set_sensor_status_cb(ua_monitor_h handle,
        return UA_ERROR_NONE;
 }
 
-int ua_monitor_unset_sensor_status_cb(ua_monitor_h handle)
+int ua_monitor_unset_sensor_status_changed_cb(ua_monitor_h handle)
 {
        FUNC_ENTRY;
        ua_monitor_s *monitor = (ua_monitor_s *)handle;

diff --git a/test/uat-init.c b/test/uat-init.c
index b88098fcecf2368cd228ce3d0e6cca2778ff7407..e6a44dc5b6e5abf2776392e87235ef7b4c8e4dce 100755 (executable)
--- a/test/uat-init.c
+++ b/test/uat-init.c
@@ -136,18 +136,18 @@ int _uat_monitor_set_sensor_status_cb()
 {
        int ret = UA_ERROR_NONE;
 
-       msg("ua_monitor_set_sensor_status_cb");
+       msg("ua_monitor_set_sensor_status_changed_cb");
 
-       ret = ua_monitor_set_sensor_status_cb(g_ua_mon_h,
+       ret = ua_monitor_set_sensor_status_changed_cb(g_ua_mon_h,
                        __sensor_status_changed_cb, g_ua_mon_h);
 
-       msg(" - ua_monitor_set_sensor_status_cb() ret: [0x%X] [%s]",
+       msg(" - ua_monitor_set_sensor_status_changed_cb() ret: [0x%X] [%s]",
                        ret, uat_get_error_str(ret));
 
        return ret;
 }
 
-static int run_ua_monitor_set_sensor_status_cb(
+static int run_ua_monitor_set_sensor_status_changed_cb(
                MManager *mm, struct menu_data *menu)
 {
        _uat_monitor_set_sensor_status_cb();
@@ -155,16 +155,16 @@ static int run_ua_monitor_set_sensor_status_cb(
        return RET_SUCCESS;
 }
 
-static int run_ua_monitor_unset_sensor_status_cb(
+static int run_ua_monitor_unset_sensor_status_changed_cb(
                MManager *mm, struct menu_data *menu)
 {
        int ret = UA_ERROR_NONE;
 
-       msg("ua_monitor_unset_sensor_status_cb");
+       msg("ua_monitor_unset_sensor_status_changed_cb");
 
-       ret = ua_monitor_unset_sensor_status_cb(g_ua_mon_h);
+       ret = ua_monitor_unset_sensor_status_changed_cb(g_ua_mon_h);
 
-       msg(" - ua_monitor_unset_sensor_status_cb() ret: [0x%X] [%s]",
+       msg(" - ua_monitor_unset_sensor_status_changed_cb() ret: [0x%X] [%s]",
                        ret, uat_get_error_str(ret));
 
        return RET_SUCCESS;
@@ -190,10 +190,10 @@ struct menu_data menu_ua_init[] = {
                NULL, run_ua_monitor_create, NULL },
        { "2", "ua_monitor_destroy",
                NULL, run_ua_monitor_destroy, NULL },
-       { "3", "ua_monitor_set_sensor_status_cb",
-               NULL, run_ua_monitor_set_sensor_status_cb, NULL },
-       { "4", "ua_monitor_unset_sensor_status_cb",
-               NULL, run_ua_monitor_unset_sensor_status_cb, NULL },
+       { "3", "ua_monitor_set_sensor_status_changed_cb",
+               NULL, run_ua_monitor_set_sensor_status_changed_cb, NULL },
+       { "4", "ua_monitor_unset_sensor_status_changed_cb",
+               NULL, run_ua_monitor_unset_sensor_status_changed_cb, NULL },
        { "5", "ua_reset_database",
                NULL, run_ua_reset_database, NULL},
        { NULL, NULL, },