- combine similar functions in telnet_server.c

git-svn-id: svn://svn.berlios.de/openocd/trunk@301 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/log.c b/src/helper/log.c
index e5dc0a23e224e6193f3d3a86ee312ff1795eff1f..4cdcfc8724d68e56a6cfbe921c68e322ed7406c6 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -34,7 +34,6 @@ int debug_level = -1;
 
 static FILE* log_output;
 
-
 static void *privData;
 static logCallback callback;
 

diff --git a/src/helper/log.h b/src/helper/log.h
index 422e2b5c0f406fb2019f8de03e7ab9ffc898b65f..09bc3a17b218d0a11d5c418f2a5454b70439b7a3 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -46,10 +46,10 @@ extern int log_register_commands(struct command_context_s *cmd_ctx);
 extern int log_init(struct command_context_s *cmd_ctx);
 extern int set_log_output(struct command_context_s *cmd_ctx, FILE *output);
 
-typedef void (*logCallback)(void *privData, const char *file, int line, 
+typedef void (*logCallback)(void *priv, const char *file, int line, 
                const char *function, const char *format, va_list args);
 
-void log_setCallback(logCallback callback, void *privData);            
+extern void log_setCallback(logCallback callback, void *priv);         
 
 extern int debug_level;
 

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 4d91902e96553e7f565b0f031859ad86101aa045..a268d81249961c59c5af3b5c1ee895b0ccd19668 100644 (file)
--- 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);
 }