diff options
| author | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-13 19:02:17 +0000 |
|---|---|---|
| committer | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-13 19:02:17 +0000 |
| commit | 2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a (patch) | |
| tree | 6703093498504afc671980ff8d506b23eefe448c /src/helper/log.h | |
| parent | edc0db163aafc78b68ad23878225703742425df5 (diff) | |
| download | openocd+libswd-2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a.tar.gz openocd+libswd-2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a.tar.bz2 openocd+libswd-2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a.tar.xz openocd+libswd-2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a.zip | |
- added patch to Improving progress/error output for telnet & GDB monitor
(thanks to Øyvind for the patch)
git-svn-id: svn://svn.berlios.de/openocd/trunk@293 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/log.h')
| -rw-r--r-- | src/helper/log.h | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/src/helper/log.h b/src/helper/log.h index 6e799ad3..34646e70 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -44,6 +44,12 @@ extern void log_printf(enum log_levels level, const char *file, int line, __attribute__ ((format (printf, 5, 6))); 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, + const char *function, const char *format, va_list args); + +void log_setCallback(logCallback callback, void *privData); extern int debug_level; @@ -67,25 +73,6 @@ extern int debug_level; log_printf (LOG_ERROR, __FILE__, __LINE__, __FUNCTION__, expr); \ } while(0) -#define SDEBUG(expr ...) \ - do { \ - short_log_printf (LOG_DEBUG, expr); \ - } while(0) - -#define SINFO(expr ...) \ - do { \ - short_log_printf (LOG_INFO, expr); \ - } while(0) - -#define SWARNING(expr ...) \ - do { \ - short_log_printf (LOG_WARNING, expr); \ - } while(0) - -#define SERROR(expr ...) \ - do { \ - short_log_printf (LOG_ERROR, expr); \ - } while(0) /* general failures * error codes < 100 @@ -95,4 +82,7 @@ extern int debug_level; #define ERROR_NO_CONFIG_FILE (-2) #define ERROR_BUF_TOO_SMALL (-3) -#endif /* ERROR_H */ +char *allocPrintf(const char *fmt, va_list ap); + + +#endif /* LOG_H */ |