From: Zachary T Welch <zw@superlucidity.net>
Date: Mon, 9 Nov 2009 14:12:02 +0000 (-0800)
Subject: log: improve log_callback_fn signature
X-Git-Tag: v0.4.0-rc1~837
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=6a2e83c01719cada03eb3bd13dc51d21d8bc964f

log: improve log_callback_fn signature

Use unsigned type for line number in log_callback_fn signature.
---

diff --git a/src/helper/command.c b/src/helper/command.c
index 5d69ffb3fb..5f3c88dc03 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -49,10 +49,10 @@ Jim_Interp *interp = NULL;
 
 int run_command(command_context_t *context, command_t *c, char *words[], int num_words);
 
-static void tcl_output(void *privData, const char *file, int line, const char *function, const char *string)
+static void tcl_output(void *privData, const char *file, unsigned line,
+		const char *function, const char *string)
 {
 	Jim_Obj *tclOutput = (Jim_Obj *)privData;
-
 	Jim_AppendString(interp, tclOutput, string, strlen(string));
 }
 
diff --git a/src/helper/log.h b/src/helper/log.h
index 15bd3c8623..aabd1be250 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -85,7 +85,7 @@ void log_catch(void);
 void log_rethrow(void);
 
 
-typedef void (*log_callback_fn)(void *priv, const char *file, int line,
+typedef void (*log_callback_fn)(void *priv, const char *file, unsigned line,
 		const char *function, const char *string);
 
 typedef struct log_callback_s
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 284def3ca7..21b58d0e45 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -49,7 +49,7 @@ extern int gdb_error(connection_t *connection, int retval);
 static unsigned short gdb_port = 3333;
 static const char *DIGITS = "0123456789abcdef";
 
-static void gdb_log_callback(void *priv, const char *file, int line,
+static void gdb_log_callback(void *priv, const char *file, unsigned line,
 		const char *function, const char *string);
 
 /* number of gdb connections, mainly to supress gdb related debugging spam
@@ -1956,7 +1956,7 @@ int gdb_detach(connection_t *connection, target_t *target)
 	return gdb_put_packet(connection, "OK", 2);
 }
 
-static void gdb_log_callback(void *priv, const char *file, int line,
+static void gdb_log_callback(void *priv, const char *file, unsigned line,
 		const char *function, const char *string)
 {
 	connection_t *connection = priv;
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 84959e3a0f..b77deff139 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -101,7 +101,7 @@ int telnet_output(struct command_context_s *cmd_ctx, const char* line)
 	return telnet_outputline(connection, line);
 }
 
-void telnet_log_callback(void *priv, const char *file, int line,
+void telnet_log_callback(void *priv, const char *file, unsigned line,
 		const char *function, const char *string)
 {
 	connection_t *connection = priv;