From cf9646bda691ce39bd113383dc24c878de8d9c39 Mon Sep 17 00:00:00 2001
From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 17 Feb 2008 11:06:58 +0000
Subject: - combine similar functions in telnet_server.c
git-svn-id: svn://svn.berlios.de/openocd/trunk@301 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/server/telnet_server.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
(limited to 'src/server')
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 4d91902e..a268d812 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);
}
--
cgit v1.2.3