Summary: passing of variable argument list reduced, strings sent to logging are now formatted just once - more efficient.

As a result, ugly string malloc+strcpy are not needed anymore.


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

2 files changed, 26 insertions, 31 deletions

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index d06c7a07..57ba2806 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -47,7 +47,7 @@ static unsigned short gdb_port;
 static const char *DIGITS = "0123456789abcdef";
 
 static void gdb_log_callback(void *priv, const char *file, int line,
-		const char *function, const char *format, va_list args);
+		const char *function, const char *string);
 
 enum gdb_detach_mode
 {
@@ -504,7 +504,7 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len)
 	return retval;
 }
 
-int gdb_output_con(connection_t *connection, char* line)
+int gdb_output_con(connection_t *connection, const char* line)
 {
 	char *hex_buffer;
 	int i, bin_size;
@@ -512,6 +512,8 @@ int gdb_output_con(connection_t *connection, char* line)
 	bin_size = strlen(line);
 
 	hex_buffer = malloc(bin_size*2 + 2);
+	if (hex_buffer == NULL)
+		return ERROR_GDB_BUFFER_TOO_SMALL;
 
 	hex_buffer[0] = 'O';
 	for (i=0; i<bin_size; i++)
@@ -527,7 +529,7 @@ int gdb_output_con(connection_t *connection, char* line)
 int gdb_output(struct command_context_s *context, char* line)
 {
 	/* this will be dumped to the log and also sent as an O packet if possible */
-	USER_SAMELINE(line);
+	USER_N(line);
 	return ERROR_OK;
 }
 
@@ -1796,7 +1798,7 @@ int gdb_detach(connection_t *connection, target_t *target)
 }
 
 static void gdb_log_callback(void *priv, const char *file, int line,
-		const char *function, const char *format, va_list args)
+		const char *function, const char *string)
 {
 	connection_t *connection = priv;
 	gdb_connection_t *gdb_con = connection->priv;
@@ -1807,13 +1809,7 @@ static void gdb_log_callback(void *priv, const char *file, int line,
 		return;
 	}
 
-	char *t = alloc_printf(format, args);
-	if (t == NULL)
-		return;
-
-	gdb_output_con(connection, t);
-
-	free(t);
+	gdb_output_con(connection, string);
 }
 
 int gdb_input_inner(connection_t *connection)
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index ea5ec575..e2f0e019 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -54,7 +54,7 @@ static char *negotiate =
  * we write to it, we will fail. Subsequent write operations will
  * succeed. Shudder!
  */
-int telnet_write(connection_t *connection, void *data, int len)
+int telnet_write(connection_t *connection, const void *data, int len)
 {
 	telnet_connection_t *t_con = connection->priv;
 	if (t_con->closed)
@@ -75,26 +75,30 @@ int telnet_prompt(connection_t *connection)
 	return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
 }
 
-int telnet_outputline(connection_t *connection, char* line)
+int telnet_outputline(connection_t *connection, const char *line)
 {
+	int len;
 	
 	/* process lines in buffer */
-	char *p=line;
-	do {
-		char *next = strchr(p, '\n');
+	while (*line) {
+		char *line_end = strchr(line, '\n');
 		
-		if (next)
-			*next++ = 0;
+		if (line_end)
+			len = line_end-line;
+		else
+		    len = strlen(line);
 
-		
-		telnet_write(connection, p, strlen(p));
-		if (next)
+		telnet_write(connection, line, len);
+		if (line_end)
 		{
 			telnet_write(connection, "\r\n\0", 3);
+			line += len+1;
 		}
-
-		p = next;
-	} while (p);
+		else
+		{
+		    line += len;
+		}
+	}
 	
 	return ERROR_OK;
 }
@@ -107,15 +111,10 @@ int telnet_output(struct command_context_s *cmd_ctx, char* line)
 }
 
 void telnet_log_callback(void *priv, const char *file, int line, 
-		const char *function, const char *format, va_list args)
+		const char *function, const char *string)
 {
 	connection_t *connection = priv;
-	char *t = alloc_printf(format, args);
-	if (t == NULL)
-		return;
-	telnet_outputline(connection, t);
-	
-	free(t);
+	telnet_outputline(connection, string);
 }
 
 int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)