X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=7d8ad51795a10fe423c9de36b9b5b43e77d52f99;hp=1a6250ce947dd47785830c325084d5d4add4bcc2;hb=3e51d893ed3d1273b5487e05196f00fe3d14773d;hpb=9f1d9499ce5d15f25c3d0f150348e16deb2e7aaf

diff --git a/src/server/server.c b/src/server/server.c
index 1a6250ce94..7d8ad51795 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -78,7 +78,7 @@ static int add_connection(struct service *service, struct command_context *cmd_c
 				(char *)&flag,		/* the cast is historical cruft */
 				sizeof(int));		/* length of option value */
 
-		LOG_INFO("accepting '%s' connection from %i", service->name, c->sin.sin_port);
+		LOG_INFO("accepting '%s' connection from %i", service->name, service->port);
 		if ((retval = service->new_connection(c)) != ERROR_OK)
 		{
 			close_socket(c->fd);
@@ -233,34 +233,6 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
 	return ERROR_OK;
 }
 
-int remove_service(unsigned short port)
-{
-	struct service **p = &services;
-	struct service *c;
-
-	/* find service */
-	while ((c = *p))
-	{
-		if (c->port == port)
-		{
-			if (c->name)
-				free(c->name);
-
-			if (c->priv)
-				free(c->priv);
-
-			/* delete service */
-			*p = c->next;
-			free(c);
-		}
-
-		/* redirect p to next list pointer */
-		p = &(*p)->next;
-	}
-
-	return ERROR_OK;
-}
-
 static int remove_services(void)
 {
 	struct service *c = services;
@@ -292,7 +264,7 @@ int server_loop(struct command_context *command_context)
 {
 	struct service *service;
 
-	bool poll = true;
+	bool poll_ok = true;
 
 	/* used in select() */
 	fd_set read_fds;
@@ -350,7 +322,7 @@ int server_loop(struct command_context *command_context)
 
 		struct timeval tv;
 		tv.tv_sec = 0;
-		if (poll)
+		if (poll_ok)
 		{
 			/* we're just polling this iteration, this is faster on embedded
 			 * hosts */
@@ -403,11 +375,11 @@ int server_loop(struct command_context *command_context)
 			FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case!  */
 
 			/* We timed out/there was nothing to do, timeout rather than poll next time */
-			poll = false;
+			poll_ok = false;
 		} else
 		{
 			/* There was something to do, next time we'll just poll */
-			poll = true;
+			poll_ok = true;
 		}
 
 		for (service = services; service; service = service->next)
@@ -541,7 +513,7 @@ int server_preinit(void)
 
 int server_init(struct command_context *cmd_ctx)
 {
-	int ret = tcl_init(cmd_ctx);
+	int ret = tcl_init();
 	if (ERROR_OK != ret)
 		return ret;