Fix coverity issues

Change-Id: Icfdbaab542d1937f481087a78f5eacf7d0b8b95f
Signed-off-by: Boram Bae <boram21.bae@samsung.com>

diff --git a/src/server/server_channel_handler.cpp b/src/server/server_channel_handler.cpp
index af7db0c..8268e6b 100644 (file)
--- a/src/server/server_channel_handler.cpp
+++ b/src/server/server_channel_handler.cpp
@@ -79,8 +79,8 @@ void server_channel_handler::disconnected(channel *ch)
 
        if (ch->loop()) {
                ch->loop()->add_idle_event(0, [](size_t, void* data) {
-                       channel* ch = (channel*)data;
-                       delete ch;
+                       channel* c = (channel*)data;
+                       delete c;
                },  ch);
        } else {
                _D("Should not be here : channel[%p]", ch);

diff --git a/src/shared/cbase_lock.cpp b/src/shared/cbase_lock.cpp
index 5a3350b..a7d7586 100644 (file)
--- a/src/shared/cbase_lock.cpp
+++ b/src/shared/cbase_lock.cpp
@@ -80,7 +80,7 @@ void cbase_lock::lock(lock_type type, const char* expr, const char *module, cons
        waiting_time = lock_acquired_time - lock_waiting_start_time;
 
        pthread_mutex_lock(&m_history_mutex);
-       _I("%s acquires lock after waiting %lluus, %s(%#p) was previously owned in %s",
+       _I("%s acquires lock after waiting %lluus, %s(%p) was previously owned in %s",
                m_curent_info, waiting_time, expr, this, m_owner_info);
        snprintf(m_owner_info, OWNER_INFO_LEN, "%s", m_curent_info);
        pthread_mutex_unlock(&m_history_mutex);

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 923bc91..f39cd8d 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -191,7 +191,7 @@ void channel::disconnect(void)
                delete m_socket;
                m_socket = NULL;
        }
-       _D("Channel[%p] is disconnected");
+       _D("Channel[%p] is disconnected", this);
 }
 
 bool channel::send(std::shared_ptr<message> msg)

diff --git a/src/shared/event_loop.cpp b/src/shared/event_loop.cpp
index f265d7b..956acad 100644 (file)
--- a/src/shared/event_loop.cpp
+++ b/src/shared/event_loop.cpp
@@ -166,8 +166,8 @@ size_t event_loop::add_idle_event(unsigned int priority, void (*fn)(size_t, void
        id->m_fn = fn;
        id->m_data = data;
 
-       g_source_set_callback(src, [](gpointer data) -> gboolean {
-               idler_data *id = (idler_data *)data;
+       g_source_set_callback(src, [](gpointer gdata) -> gboolean {
+               idler_data *id = (idler_data *)gdata;
                id->m_fn((size_t)id, id->m_data);
                delete id;
                return G_SOURCE_REMOVE;