sensord: remove sensord compiler warnings

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

diff --git a/src/client/client_common.h b/src/client/client_common.h
index 85606db..8b5ec8e 100644 (file)
--- a/src/client/client_common.h
+++ b/src/client/client_common.h
@@ -27,12 +27,11 @@
 #include <sensor_log.h>
 
 #define BASE_GATHERING_INTERVAL        100
-
 #define CLIENT_NAME_SIZE NAME_MAX+10
 
 struct log_attr {
-       char *sensor_name;
-       char *event_name;
+       const char *sensor_name;
+       const char *event_name;
 };
 
 bool is_one_shot_event(unsigned int event_type);

diff --git a/src/client/sensor_event_listener.cpp b/src/client/sensor_event_listener.cpp
index 9e14fc2..778392d 100644 (file)
--- a/src/client/sensor_event_listener.cpp
+++ b/src/client/sensor_event_listener.cpp
@@ -28,7 +28,7 @@
 #include <sensor_types.h>
 
 /* TODO: this macro should be adjusted(4224 = 4096(data) + 128(header)) */
-#define EVENT_BUFFER_SIZE 4224
+#define EVENT_BUFFER_SIZE sizeof(sensor_event_t)
 
 using std::thread;
 using std::pair;
@@ -368,7 +368,8 @@ void sensor_event_listener::listen_events(void)
                        break;
                }
 
-               data_len = ((sensor_event_t *)buffer)->data_length;
+               sensor_event_t *sensor_event = reinterpret_cast<sensor_event_t *>(buffer);
+               data_len = sensor_event->data_length;
                buffer_data = malloc(data_len);
 
                len = sensor_event_poll(buffer_data, data_len, event);
@@ -378,7 +379,7 @@ void sensor_event_listener::listen_events(void)
                        break;
                }
 
-               ((sensor_event_t *)buffer)->data = (sensor_data_t *)buffer_data;
+               sensor_event->data = reinterpret_cast<sensor_data_t *>(buffer_data);
 
                handle_events((void *)buffer);
        } while (true);

diff --git a/src/server/sensor_event_dispatcher.cpp b/src/server/sensor_event_dispatcher.cpp
index df64e80..b03a5e4 100644 (file)
--- a/src/server/sensor_event_dispatcher.cpp
+++ b/src/server/sensor_event_dispatcher.cpp
@@ -151,10 +151,8 @@ void sensor_event_dispatcher::send_sensor_events(vector<void *> &events)
        for (unsigned int i = 0; i < events.size(); ++i) {
                sensor_id_t sensor_id;
                unsigned int event_type;
-               int length;
 
                sensor_event = (sensor_event_t*)events[i];
-               length = sizeof(sensor_event_t) + sensor_event->data_length;
                sensor_id = sensor_event->sensor_id;
                event_type = sensor_event->event_type;
 

diff --git a/src/server/sensor_loader.cpp b/src/server/sensor_loader.cpp
index d8636f1..5626214 100644 (file)
--- a/src/server/sensor_loader.cpp
+++ b/src/server/sensor_loader.cpp
@@ -260,7 +260,7 @@ bool sensor_loader::get_paths_from_dir(const string &dir_path, vector<string> &h
 
        string name;
 
-       while (dir_entry = readdir(dir)) {
+       while ((dir_entry = readdir(dir))) {
                name = string(dir_entry->d_name);
 
                if (name == "." || name == "..")

diff --git a/src/test/src/sensor-test.c b/src/test/src/sensor-test.c
index 9f5310f..823f246 100644 (file)
--- a/src/test/src/sensor-test.c
+++ b/src/test/src/sensor-test.c
@@ -215,7 +215,11 @@ int main(int argc, char **argv)
                arg.event = event;
                arg.interval = interval;
 
-               return check_sensor((void*)&arg);
+               void *result = check_sensor((void*)&arg);
 
+               if (!result)
+                       return -1;
+
+               return 0;
        }
 }