From ca7cbd89f4eb28241c8a896a1b0fdbfe16964137 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Fri, 27 Nov 2015 19:17:47 +0000
Subject: [PATCH] Fix compiler warnings

---
 src/network.c   | 12 ++++++------
 tests/rigctld.c |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/network.c b/src/network.c
index 0b6719bcd..17f3830cf 100644
--- a/src/network.c
+++ b/src/network.c
@@ -118,7 +118,7 @@ int network_open(hamlib_port_t *rp, int default_port)
 	int fd;				/* File descriptor for the port */
 	int status;
 	struct addrinfo hints, *res, *saved_res;
-	char *hoststr, *portstr, *bracketstr1, *bracketstr2;
+	char *hoststr = NULL, *portstr = NULL, *bracketstr1, *bracketstr2;
 	char hostname[FILPATHLEN];
 	char defaultportstr[8];
 
@@ -171,11 +171,11 @@ int network_open(hamlib_port_t *rp, int default_port)
 						{
 							*portstr++ = '\0';
 						}
-					else
-						{
-							sprintf(defaultportstr, "%d", default_port);
-							portstr = defaultportstr;
-						}
+				}
+			if (!portstr)
+				{
+					sprintf(defaultportstr, "%d", default_port);
+					portstr = defaultportstr;
 				}
 		}
 
diff --git a/tests/rigctld.c b/tests/rigctld.c
index de91c62bc..ba7a7e31d 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -167,7 +167,6 @@ int main (int argc, char *argv[])
 	char *civaddr = NULL;	/* NULL means no need to set conf */
 	char conf_parms[MAXCONFLEN] = "";
 
-	int sockopt;
 	struct addrinfo hints, *result, *saved_result;
 	int sock_listen;
 	int reuseaddr = 1;
@@ -403,7 +402,7 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 
-	sockopt = SO_SYNCHRONOUS_NONALERT;
+	int sockopt = SO_SYNCHRONOUS_NONALERT;
 	setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&sockopt, sizeof(sockopt));
 #endif