From 29d1388cb0f708fa32834a05b56039e56cb72e1e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 23 Nov 2020 09:15:45 +0100
Subject: [SERVER] Fix warnings

---
 src/server/altservers.c | 3 ++-
 src/server/image.c      | 6 +++---
 src/server/rpc.c        | 4 ++--
 src/server/uplink.c     | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/altservers.c b/src/server/altservers.c
index 4b87c3e..2b65def 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -561,7 +561,8 @@ static void altservers_findUplinkInternal(dnbd3_uplink_t *uplink)
 			goto image_failed;
 		}
 		// See if selecting the image succeeded ++++++++++++++++++++++++++++++
-		uint16_t protocolVersion, rid;
+		uint16_t protocolVersion = 0;
+		uint16_t rid;
 		uint64_t imageSize;
 		char *name;
 		serialized_buffer_t serialized;
diff --git a/src/server/image.c b/src/server/image.c
index 96f27d4..644e2a1 100644
--- a/src/server/image.c
+++ b/src/server/image.c
@@ -1245,16 +1245,16 @@ static dnbd3_image_t *loadImageProxy(char * const name, const uint16_t revision,
 	int uplinkSock = -1;
 	dnbd3_host_t uplinkServer;
 	const int count = altservers_getHostListForReplication( name, servers, REP_NUM_SRV );
-	uint16_t remoteProtocolVersion;
 	uint16_t remoteRid = revision;
 	uint16_t acceptedRemoteRid = 0;
-	uint64_t remoteImageSize;
+	uint16_t remoteProtocolVersion = 0;
 	struct sockaddr_storage sa;
 	socklen_t salen;
 	poll_list_t *cons = sock_newPollList();
 	logadd( LOG_DEBUG2, "Trying to clone %s:%d from %d hosts", name, (int)revision, count );
 	for (int i = 0; i < count + 5; ++i) { // "i < count + 5" for 5 additional iterations, waiting on pending connects
-		char *remoteName;
+		char *remoteName = NULL;
+		uint64_t remoteImageSize = 0;
 		bool ok = false;
 		int sock;
 		if ( i >= count ) {
diff --git a/src/server/rpc.c b/src/server/rpc.c
index f2877fa..9bef5ee 100644
--- a/src/server/rpc.c
+++ b/src/server/rpc.c
@@ -146,7 +146,7 @@ void rpc_sendStatsJson(int sock, dnbd3_host_t* host, const void* data, const int
 	while ( !_shutdown ) {
 		// Read request from client
 		struct phr_header headers[100];
-		size_t numHeaders, prevLen = 0, consumed;
+		size_t numHeaders, prevLen = 0, consumed = 0;
 		struct string method, path;
 		int minorVersion;
 		while ( !_shutdown ) {
@@ -496,7 +496,7 @@ static void addacl(int argc, char **argv, void *data UNUSED)
 		*slash++ = '\0';
 	}
 	if ( !parse_address( argv[0], &host ) ) goto unlock_end;
-	long int bits;
+	long int bits = 0;
 	if ( slash != NULL ) {
 		char *last;
 		bits = strtol( slash, &last, 10 );
diff --git a/src/server/uplink.c b/src/server/uplink.c
index 1fded60..e4d9d0e 100644
--- a/src/server/uplink.c
+++ b/src/server/uplink.c
@@ -337,7 +337,7 @@ static bool uplink_requestInternal(dnbd3_uplink_t *uplink, void *data, uplink_ca
 				break;
 			}
 		}
-		dnbd3_queue_client_t **c;
+		dnbd3_queue_client_t **c = NULL;
 		if ( request == NULL ) {
 			// No existing request to attach to
 			if ( uplink->queueLen >= UPLINK_MAX_QUEUE ) {
@@ -395,6 +395,7 @@ static bool uplink_requestInternal(dnbd3_uplink_t *uplink, void *data, uplink_ca
 		req.start = request->from;
 		req.end = request->to;
 		if ( callback != NULL ) {
+			assert( c != NULL );
 			*c = malloc( sizeof( *request->clients ) );
 			(**c).next = NULL;
 			(**c).handle = handle;
-- 
cgit v1.2.3-55-g7522