X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=e53f37d0b8ee05c341730be64ce6becf84eeed76;hb=cb8e3fb2d925c6563c3520391c3b1c7e71d1b817;hp=d96f0b6cf61b765b34ba22e06aec828c70640bb8;hpb=1f08ada36681245e53251d3210ec8706391c2fc9;p=openocd.git

diff --git a/src/server/server.c b/src/server/server.c
index d96f0b6cf6..e53f37d0b8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -403,19 +403,14 @@ static int remove_services(void)
 
 		remove_connections(c);
 
-		if (c->name)
-			free(c->name);
+		free(c->name);
 
 		if (c->type == CONNECTION_PIPE) {
 			if (c->fd != -1)
 				close(c->fd);
 		}
-		if (c->port)
-			free(c->port);
-
-		if (c->priv)
-			free(c->priv);
-
+		free(c->port);
+		free(c->priv);
 		/* delete service */
 		free(c);
 
@@ -600,7 +595,7 @@ int server_loop(struct command_context *command_context)
 	return shutdown_openocd == SHUTDOWN_WITH_ERROR_CODE ? ERROR_FAIL : ERROR_OK;
 }
 
-void sig_handler(int sig)
+static void sig_handler(int sig)
 {
 	/* store only first signal that hits us */
 	if (shutdown_openocd == CONTINUE_MAIN_LOOP) {