sensord: fix warnings detected from static analysis

- fix member variable initialziation ordered warnings
- add missing breaks in switch-case statement
- check the range of index

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

diff --git a/src/client/sensor_listener.cpp b/src/client/sensor_listener.cpp
index da9dbe8..a5c4af2 100644 (file)
--- a/src/client/sensor_listener.cpp
+++ b/src/client/sensor_listener.cpp
@@ -47,9 +47,11 @@ public:
                case CMD_LISTENER_EVENT:
                        if (m_listener->get_event_handler())
                                m_listener->get_event_handler()->read(ch, msg);
+                       break;
                case CMD_LISTENER_ACC_EVENT:
                        if (m_listener->get_accuracy_handler())
                                m_listener->get_accuracy_handler()->read(ch, msg);
+                       break;
                }
        }
 

diff --git a/src/sensorctl/sensor_adapter.cpp b/src/sensorctl/sensor_adapter.cpp
index 9ed2b24..82a54a2 100644 (file)
--- a/src/sensorctl/sensor_adapter.cpp
+++ b/src/sensorctl/sensor_adapter.cpp
@@ -73,6 +73,8 @@ bool sensor_adapter::start(sensor_info info, int &handle)
 
        err = sensord_get_sensors(info.type, &sensors, &count);
        ASSERT_EQ(err, 0);
+       ASSERT_LT(info.index, count);
+       ASSERT_GE(info.index, 0);
 
        handle = sensord_connect(sensors[info.index]);
        ASSERT_GE(handle, 0);

diff --git a/src/sensorctl/test_bench.cpp b/src/sensorctl/test_bench.cpp
index 191fb0d..201a7f5 100644 (file)
--- a/src/sensorctl/test_bench.cpp
+++ b/src/sensorctl/test_bench.cpp
@@ -51,6 +51,7 @@ void test_option::set_options(int argc, char *argv[])
 test_case::test_case(const std::string &group, const std::string &name)
 : m_group(group)
 , m_name(name)
+, m_func(NULL)
 {
        test_bench::register_testcase(group, this);
 }

diff --git a/src/server/external_sensor_handler.cpp b/src/server/external_sensor_handler.cpp
index 110e15b..7ace9a5 100644 (file)
--- a/src/server/external_sensor_handler.cpp
+++ b/src/server/external_sensor_handler.cpp
@@ -60,8 +60,8 @@ int external_sensor_notifier::notify(void)
 external_sensor_handler::external_sensor_handler(const sensor_info &info,
                external_sensor *sensor)
 : m_info(info)
-, m_sensor(sensor)
 , m_notifier(NULL)
+, m_policy(OP_DEFAULT)
 {
        init();
 }

diff --git a/src/server/fusion_sensor_handler.cpp b/src/server/fusion_sensor_handler.cpp
index 44c794a..ace60b8 100644 (file)
--- a/src/server/fusion_sensor_handler.cpp
+++ b/src/server/fusion_sensor_handler.cpp
@@ -29,7 +29,6 @@ fusion_sensor_handler::fusion_sensor_handler(const sensor_info &info,
                fusion_sensor *sensor)
 : m_info(info)
 , m_sensor(sensor)
-, m_policy(OP_DEFAULT)
 {
 }
 
@@ -187,7 +186,7 @@ int fusion_sensor_handler::set_attribute(sensor_observer *ob, int32_t attr, int3
        policy = m_sensor->set_attribute(ob, attr, value);
        retv_if(policy <= OP_ERROR, policy);
 
-       if (m_policy == OP_DEFAULT) {
+       if (policy == OP_DEFAULT) {
                /* default logic */
        }
 
@@ -203,7 +202,7 @@ int fusion_sensor_handler::set_attribute(sensor_observer *ob, int32_t attr, cons
        policy = m_sensor->set_attribute(ob, attr, value, len);
        retv_if(policy <= OP_ERROR, policy);
 
-       if (m_policy == OP_DEFAULT) {
+       if (policy == OP_DEFAULT) {
                /* default logic */
        }
 

diff --git a/src/server/fusion_sensor_handler.h b/src/server/fusion_sensor_handler.h
index d16278f..151bb16 100644 (file)
--- a/src/server/fusion_sensor_handler.h
+++ b/src/server/fusion_sensor_handler.h
@@ -71,7 +71,6 @@ private:
 
        std::unordered_map<sensor_observer *, int> m_interval_map;
        std::unordered_map<sensor_observer *, int> m_batch_latency_map;
-       int m_policy;
 };
 
 }

diff --git a/src/shared/ipc_server.cpp b/src/shared/ipc_server.cpp
index 9723a98..dba54f0 100644 (file)
--- a/src/shared/ipc_server.cpp
+++ b/src/shared/ipc_server.cpp
@@ -30,6 +30,9 @@ using namespace ipc;
 #define MAX_CONNECTIONS 1000
 
 ipc_server::ipc_server(const std::string &path)
+: m_event_loop(NULL)
+, m_handler(NULL)
+, m_accept_handler(NULL)
 {
        m_accept_sock.create(path);
 }

diff --git a/src/shared/socket.cpp b/src/shared/socket.cpp
index 239e554..b29ba96 100644 (file)
--- a/src/shared/socket.cpp
+++ b/src/shared/socket.cpp
@@ -375,12 +375,11 @@ bool socket::set_recv_timeout(int sec)
 bool socket::set_sock_type(int type)
 {
        socklen_t opt_len;
-       int sock_type;
-       opt_len = sizeof(sock_type);
+       opt_len = sizeof(type);
 
        retvm_if(m_sock_fd < 0, false, "Invalid socket[%d]", m_sock_fd);
 
-       if (setsockopt(m_sock_fd, SOL_SOCKET, SO_TYPE, &sock_type, opt_len) < 0) {
+       if (setsockopt(m_sock_fd, SOL_SOCKET, SO_TYPE, &type, opt_len) < 0) {
           _ERRNO(errno, _E, "Failed to setsockopt[%d]", m_sock_fd);
           return false;
        }