X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=a268d81249961c59c5af3b5c1ee895b0ccd19668;hb=cf9646bda691ce39bd113383dc24c878de8d9c39;hp=4d91902e96553e7f565b0f031859ad86101aa045;hpb=e859281eb3cb977cd26588b595f0519fcad605f6;p=openocd.git

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 4d91902e96..a268d81249 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -57,12 +57,6 @@ void telnet_prompt(connection_t *connection)
 	write_socket(connection->fd, t_con->prompt, strlen(t_con->prompt));
 }
 
-int telnet_outputline(connection_t *connection, char* line)
-{
-	write_socket(connection->fd, line, strlen(line));
-	return write_socket(connection->fd, "\r\n\0", 3);
-}
-
 int telnet_output(struct command_context_s *cmd_ctx, char* line)
 {
 	connection_t *connection = cmd_ctx->output_handler_priv;
@@ -73,16 +67,15 @@ int telnet_output(struct command_context_s *cmd_ctx, char* line)
 	return ERROR_OK;
 }
 
-void telnet_log_callback(void *privData, const char *file, int line, 
+void telnet_log_callback(void *priv, const char *file, int line, 
 		const char *function, const char *format, va_list args)
 {
-	connection_t *connection = (connection_t *)privData;
+	connection_t *connection = priv;
 	char *t = allocPrintf(format, args);
 	if (t == NULL)
 		return;
 	
-	telnet_outputline(connection, t);
-	
+	telnet_output(connection->cmd_ctx, t);
 	free(t);
 }