sensord: rename information list/map properly

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

diff --git a/src/client/sensor_manager.cpp b/src/client/sensor_manager.cpp
index c50cdae..4be1065 100644 (file)
--- a/src/client/sensor_manager.cpp
+++ b/src/client/sensor_manager.cpp
@@ -124,7 +124,7 @@ bool sensor_manager::is_supported(sensor_t sensor)
 {
        retvm_if(!sensor, false, "Invalid parameter[%#x]", sensor);
 
-       for (auto it = m_infos.begin(); it != m_infos.end(); ++it) {
+       for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
                if (&*it == sensor)
                        return true;
        }
@@ -137,7 +137,7 @@ bool sensor_manager::is_supported(const char *uri)
        if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
                return true;
 
-       for (auto it = m_infos.begin(); it != m_infos.end(); ++it) {
+       for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
                std::size_t found = (*it).get_uri().rfind(uri);
 
                if (found != std::string::npos)
@@ -264,7 +264,7 @@ bool sensor_manager::get_sensors_internal(void)
 
        reply.disclose(buf);
 
-       decode_sensors(buf, m_infos);
+       decode_sensors(buf, m_sensors);
 
        return true;
 }
@@ -297,9 +297,9 @@ bool sensor_manager::has_privilege(std::string &uri)
 sensor_info *sensor_manager::get_info(const char *uri)
 {
        if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
-               return &m_infos[0];
+               return &m_sensors[0];
 
-       for (auto it = m_infos.begin(); it != m_infos.end(); ++it) {
+       for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
                std::size_t found = (*it).get_uri().rfind(uri);
 
                if (found == std::string::npos)
@@ -323,7 +323,7 @@ std::vector<sensor_info *> sensor_manager::get_infos(const char *uri)
        if (strncmp(uri, utils::get_uri(ALL_SENSOR), SIZE_STR_SENSOR_ALL) == 0)
                all = true;
 
-for (auto it = m_infos.begin(); it != m_infos.end(); ++it) {
+       for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
                std::size_t found = (*it).get_uri().rfind(uri);
 
                if (!all && found == std::string::npos)

diff --git a/src/client/sensor_manager.h b/src/client/sensor_manager.h
index 5cb7d40..8839943 100644 (file)
--- a/src/client/sensor_manager.h
+++ b/src/client/sensor_manager.h
@@ -54,7 +54,7 @@ public:
        /* int unregister_sensor(const char *uri) */
 
 private:
-       typedef std::vector<sensor_info> sensor_infos_t;
+       typedef std::vector<sensor_info> sensor_list_t;
 
        bool init(void);
        void deinit(void);
@@ -75,7 +75,7 @@ private:
        ipc::event_loop m_loop;
        std::atomic<bool> m_connected;
 
-       sensor_infos_t m_infos;
+       sensor_list_t m_sensors;
 };
 
 }

diff --git a/src/shared/event_loop.cpp b/src/shared/event_loop.cpp
index 73854b5..1b569a1 100644 (file)
--- a/src/shared/event_loop.cpp
+++ b/src/shared/event_loop.cpp
@@ -127,7 +127,7 @@ uint64_t event_loop::add_event(const int fd, const event_condition cond, event_h
        g_source_set_callback(src, (GSourceFunc) g_io_handler, info, NULL);
        g_source_attach(src, g_main_loop_get_context(m_mainloop));
 
-       m_infos[id] = info;
+       m_handlers[id] = info;
 
        /* _D("Added[%llu](fd:%d)", id, fd); */
        return id;
@@ -151,14 +151,14 @@ uint64_t event_loop::add_idle_event(unsigned int priority, idle_handler *handler
 
 bool event_loop::remove_event(uint64_t id, bool close_channel)
 {
-       auto it = m_infos.find(id);
-       retv_if(it == m_infos.end(), false);
+       auto it = m_handlers.find(id);
+       retv_if(it == m_handlers.end(), false);
 
        if (close_channel)
                g_io_channel_shutdown(it->second->g_ch, TRUE, NULL);
 
        release_info(it->second);
-       m_infos.erase(it);
+       m_handlers.erase(it);
 
        /* _D("Removed[%llu]", id); */
        return true;
@@ -166,10 +166,10 @@ bool event_loop::remove_event(uint64_t id, bool close_channel)
 
 void event_loop::remove_all_events(void)
 {
-       auto it = m_infos.begin();
-       while (it != m_infos.end()) {
+       auto it = m_handlers.begin();
+       while (it != m_handlers.end()) {
                release_info(it->second);
-               it = m_infos.erase(it);
+               it = m_handlers.erase(it);
        }
 }
 

diff --git a/src/shared/event_loop.h b/src/shared/event_loop.h
index 934a8b4..870e6a3 100644 (file)
--- a/src/shared/event_loop.h
+++ b/src/shared/event_loop.h
@@ -92,7 +92,7 @@ private:
        std::atomic<bool> m_running;
        std::atomic<bool> m_terminating;
        std::atomic<uint64_t> m_sequence;
-       std::map<uint64_t, handler_info *> m_infos;
+       std::map<uint64_t, handler_info *> m_handlers;
 
        int m_term_fd;
 };