Merge branch 'master' of github.com:janvidar/uhub

src/network/connection.c

@@ -307,7 +307,7 @@ static void net_connect_job_internal_cb(struct net_connection* con, int event, v
 }
 
 
-static int net_connect_cancel(struct net_connect_handle* handle)
+static void net_connect_cancel(struct net_connect_handle* handle)
 {
 	struct net_connect_job* job;
 
@@ -363,6 +363,7 @@ static int net_connect_process(struct net_connect_handle* handle)
 		return 1; // Connected - cool!
 
 	net_connect_process_queue(handle, handle->job4);
+	return 0;
 }
 
 

src/network/openssl.c

@@ -182,6 +182,8 @@ static int handle_openssl_error(struct net_connection* con, int ret, enum ssl_st
 			handle->state = tls_st_error;
 			return -2;
 	}
+
+	return -2;
 }
 
 ssize_t net_con_ssl_accept(struct net_connection* con)

src/network/timeout.c

@@ -58,13 +58,13 @@ static int timeout_queue_locked(struct timeout_queue* t)
 	return t->lock.ptr != NULL;
 }
 
-static int timeout_queue_lock(struct timeout_queue* t)
+static void timeout_queue_lock(struct timeout_queue* t)
 {
 	t->lock.ptr = t;
 }
 
 // unlock and flush the locked events to the main timeout queue.
-static int timeout_queue_unlock(struct timeout_queue* t)
+static void timeout_queue_unlock(struct timeout_queue* t)
 {
 	struct timeout_evt* evt, *tmp, *first;
 	size_t pos;

src/system.h

@@ -103,6 +103,8 @@
 #ifdef SSL_USE_OPENSSL
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/engine.h>
+#include <openssl/conf.h>
 #endif /* SSL_USE_OPENSSL */
 #ifdef SSL_USE_GNUTLS
 #include <gnutls/gnutls.h>

src/tools/adcrush.c

@@ -156,7 +156,7 @@ static size_t get_next_timeout_evt()
 		case 2: return get_wait_rand(15);
 		case 3: return get_wait_rand(5);
 	}
-
+	return 0;
 }