From cf9646bda691ce39bd113383dc24c878de8d9c39 Mon Sep 17 00:00:00 2001 From: ntfreak 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/helper/log.c | 1 - src/helper/log.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/helper') diff --git a/src/helper/log.c b/src/helper/log.c index e5dc0a23..4cdcfc87 100644 --- 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 422e2b5c..09bc3a17 100644 --- 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; -- cgit v1.2.3