summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-17 11:06:58 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-17 11:06:58 +0000
commitcf9646bda691ce39bd113383dc24c878de8d9c39 (patch)
treef7302d406b8563970ba60bd9116e4a0d2ae501b9 /src/helper
parente859281eb3cb977cd26588b595f0519fcad605f6 (diff)
downloadopenocd+libswd-cf9646bda691ce39bd113383dc24c878de8d9c39.tar.gz
openocd+libswd-cf9646bda691ce39bd113383dc24c878de8d9c39.tar.bz2
openocd+libswd-cf9646bda691ce39bd113383dc24c878de8d9c39.tar.xz
openocd+libswd-cf9646bda691ce39bd113383dc24c878de8d9c39.zip
- combine similar functions in telnet_server.c
git-svn-id: svn://svn.berlios.de/openocd/trunk@301 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/log.c1
-rw-r--r--src/helper/log.h4
2 files changed, 2 insertions, 3 deletions
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;