Fix gcc warnings

diff --git a/src/include/signals.h b/src/include/signals.h
index 0bd135b..5c7f2c7 100644 (file)
--- a/src/include/signals.h
+++ b/src/include/signals.h
@@ -22,3 +22,5 @@ void    mk_signal_handler(int signo);
 void    mk_signal_init();
 void   mk_signal_term();
 void mk_signal_thread_sigpipe_safe();
+
+

diff --git a/src/scheduler.c b/src/scheduler.c
index e62f14c..1ed0fa0 100644 (file)
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -30,7 +30,6 @@
 
 #include "monkey.h"
 #include "connection.h"
-#include "signal.h"
 #include "scheduler.h"
 #include "memory.h"
 #include "epoll.h"
@@ -38,6 +37,7 @@
 #include "cache.h"
 #include "config.h"
 #include "clock.h"
+#include "signals.h"
 
 /* Register thread information */
 int mk_sched_register_thread(pthread_t tid, int efd)
@@ -170,7 +170,7 @@ void mk_sched_set_thread_poll(int epoll)
 
 int mk_sched_get_thread_poll()
 {
-       return pthread_getspecific(epoll_fd);
+       return (int) pthread_getspecific(epoll_fd);
 }
 
 struct sched_list_node *mk_sched_get_thread_conf()

diff --git a/src/socket.c b/src/socket.c
index 0c108dc..d8bf646 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -73,7 +73,8 @@ char *mk_socket_get_ip(int socket)
  
         len = sizeof(m_addr);
         getpeername(socket, (struct sockaddr*)&m_addr,  &len);
-        return inet_ntop(PF_INET, &m_addr.sin_addr, ipv4, ipv4_len);
+        inet_ntop(PF_INET, &m_addr.sin_addr, ipv4, ipv4_len);
+        return ipv4;
 }
 
 int mk_socket_close(int socket)