sensord: rename set_interval_cb to interval_changed_cb

Change-Id: I9f7dd165b8b4a2aa3f244c4f5061f1b96d0cec84
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/include/sensor_internal.h b/include/sensor_internal.h
index 49609b6..ee3b375 100644 (file)
--- a/include/sensor_internal.h
+++ b/include/sensor_internal.h
@@ -420,8 +420,8 @@ int sensord_provider_set_start_cb(sensord_provider_h provider, sensord_provider_
 typedef void (*sensord_provider_stop_cb)(sensord_provider_h provider, void *user_data);
 int sensord_provider_set_stop_cb(sensord_provider_h provider, sensord_provider_stop_cb callback, void *user_data);
 
-typedef void (*sensord_provider_set_interval_cb)(sensord_provider_h provider, unsigned int interval_ms, void *user_data);
-int sensord_provider_set_set_interval_cb(sensord_provider_h provider, sensord_provider_set_interval_cb callback, void *user_data);
+typedef void (*sensord_provider_interval_changed_cb)(sensord_provider_h provider, unsigned int interval_ms, void *user_data);
+int sensord_provider_set_interval_changed_cb(sensord_provider_h provider, sensord_provider_interval_changed_cb callback, void *user_data);
 
 int sensord_provider_publish(sensord_provider_h provider, sensor_data_t data);
 

diff --git a/src/client-dummy/client_dummy.cpp b/src/client-dummy/client_dummy.cpp
index 63ae2ea..ee8cde3 100644 (file)
--- a/src/client-dummy/client_dummy.cpp
+++ b/src/client-dummy/client_dummy.cpp
@@ -290,7 +290,7 @@ API int sensord_provider_set_stop_cb(sensord_provider_h provider, sensord_provid
        return OP_ERROR;
 }
 
-API int sensord_provider_set_set_interval_cb(sensord_provider_h provider, sensord_provider_set_interval_cb callback, void *user_data)
+API int sensord_provider_set_interval_changed_cb(sensord_provider_h provider, sensord_provider_interval_changed_cb callback, void *user_data)
 {
        return OP_ERROR;
 }

diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp
index dcd497a..fe3e554 100644 (file)
--- a/src/client/sensor_internal.cpp
+++ b/src/client/sensor_internal.cpp
@@ -732,7 +732,7 @@ API int sensord_provider_set_stop_cb(sensord_provider_h provider, sensord_provid
        return OP_SUCCESS;
 }
 
-API int sensord_provider_set_set_interval_cb(sensord_provider_h provider, sensord_provider_set_interval_cb callback, void *user_data)
+API int sensord_provider_set_interval_changed_cb(sensord_provider_h provider, sensord_provider_interval_changed_cb callback, void *user_data)
 {
        retvm_if(!provider, -EINVAL, "Invalid paramter");
        retvm_if(!callback, -EINVAL, "Invalid paramter");

diff --git a/src/client/sensor_provider.cpp b/src/client/sensor_provider.cpp
index 94036e0..f2eae8b 100644 (file)
--- a/src/client/sensor_provider.cpp
+++ b/src/client/sensor_provider.cpp
@@ -199,7 +199,7 @@ void sensor_provider::set_stop_cb(sensord_provider_stop_cb cb, void *user_data)
        m_handler->set_stop_cb(cb, user_data);
 }
 
-void sensor_provider::set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data)
+void sensor_provider::set_interval_cb(sensord_provider_interval_changed_cb cb, void *user_data)
 {
        m_handler->set_interval_cb(cb, user_data);
 }

diff --git a/src/client/sensor_provider.h b/src/client/sensor_provider.h
index b499995..2191b60 100644 (file)
--- a/src/client/sensor_provider.h
+++ b/src/client/sensor_provider.h
@@ -46,7 +46,7 @@ public:
 
        void set_start_cb(sensord_provider_start_cb cb, void *user_data);
        void set_stop_cb(sensord_provider_stop_cb cb, void *user_data);
-       void set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data);
+       void set_interval_cb(sensord_provider_interval_changed_cb cb, void *user_data);
 
        int publish(sensor_data_t *data, int len);
 

diff --git a/src/client/sensor_provider_channel_handler.cpp b/src/client/sensor_provider_channel_handler.cpp
index 52cc6bf..ed3fd01 100644 (file)
--- a/src/client/sensor_provider_channel_handler.cpp
+++ b/src/client/sensor_provider_channel_handler.cpp
@@ -29,10 +29,10 @@ sensor_provider::channel_handler::channel_handler(sensor_provider *provider)
 : m_provider(provider)
 , m_start_cb(NULL)
 , m_stop_cb(NULL)
-, m_set_interval_cb(NULL)
+, m_interval_changed_cb(NULL)
 , m_start_user_data(NULL)
 , m_stop_user_data(NULL)
-, m_set_interval_user_data(NULL)
+, m_interval_changed_user_data(NULL)
 {
 }
 
@@ -62,8 +62,8 @@ void sensor_provider::channel_handler::read(ipc::channel *ch, ipc::message &msg)
                cmd_provider_attr_int_t buf;
                msg.disclose((char *)&buf);
 
-               if (buf.attribute == SENSORD_ATTRIBUTE_INTERVAL && m_set_interval_cb)
-                       m_set_interval_cb(m_provider, buf.value, m_set_interval_user_data);
+               if (buf.attribute == SENSORD_ATTRIBUTE_INTERVAL && m_interval_changed_cb)
+                       m_interval_changed_cb(m_provider, buf.value, m_interval_changed_user_data);
                break;
        }
 }
@@ -88,8 +88,8 @@ void sensor_provider::channel_handler::set_stop_cb(sensord_provider_stop_cb cb,
        m_stop_user_data = user_data;
 }
 
-void sensor_provider::channel_handler::set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data)
+void sensor_provider::channel_handler::set_interval_cb(sensord_provider_interval_changed_cb cb, void *user_data)
 {
-       m_set_interval_cb = cb;
-       m_set_interval_user_data = user_data;
+       m_interval_changed_cb = cb;
+       m_interval_changed_user_data = user_data;
 }

diff --git a/src/client/sensor_provider_channel_handler.h b/src/client/sensor_provider_channel_handler.h
index efe5ce5..877f9db 100644 (file)
--- a/src/client/sensor_provider_channel_handler.h
+++ b/src/client/sensor_provider_channel_handler.h
@@ -40,18 +40,18 @@ public:
 
        void set_start_cb(sensord_provider_start_cb cb, void *user_data);
        void set_stop_cb(sensord_provider_stop_cb cb, void *user_data);
-       void set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data);
+       void set_interval_cb(sensord_provider_interval_changed_cb cb, void *user_data);
 
 private:
        sensor_provider *m_provider;
 
        sensord_provider_start_cb m_start_cb;
        sensord_provider_stop_cb m_stop_cb;
-       sensord_provider_set_interval_cb m_set_interval_cb;
+       sensord_provider_interval_changed_cb m_interval_changed_cb;
 
        void *m_start_user_data;
        void *m_stop_user_data;
-       void *m_set_interval_user_data;
+       void *m_interval_changed_user_data;
 };
 
 }

diff --git a/src/sensorctl/testcase/unit_provider.cpp b/src/sensorctl/testcase/unit_provider.cpp
index 89ae9e3..0c61862 100644 (file)
--- a/src/sensorctl/testcase/unit_provider.cpp
+++ b/src/sensorctl/testcase/unit_provider.cpp
@@ -164,7 +164,7 @@ TESTCASE(sensor_api_provider_mysensor, provider_p_1)
        ASSERT_EQ(err, 0);
        err = sensord_provider_set_stop_cb(provider, stop_cb, NULL);
        ASSERT_EQ(err, 0);
-       err = sensord_provider_set_set_interval_cb(provider, interval_cb, NULL);
+       err = sensord_provider_set_interval_changed_cb(provider, interval_cb, NULL);
        ASSERT_EQ(err, 0);
 
        err = sensord_get_default_sensor_by_uri(MYSENSOR_URI, &sensor);