Michael Bruck: 64 bit va_list fix for crash

[fw/openocd] / src / helper / log.h

diff --git a/src/helper/log.h b/src/helper/log.h
index ab32760a96b3c7e2190d8856d7874d76b24deae6..c40784474e3120f0f8cc94d41258aa1c7ac30ba9 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -36,6 +36,7 @@
  */
 enum log_levels
 {
+       LOG_OUTPUT = -2,
        LOG_USER = -1,
        LOG_ERROR = 0,
        LOG_WARNING = 1,
@@ -45,45 +46,58 @@ enum log_levels
 
 extern void log_printf(enum log_levels level, const char *file, int line, 
        const char *function, const char *format, ...) 
-       __attribute__ ((format (printf, 5, 6)));
+__attribute__ ((format (printf, 5, 6)));
+extern void log_printf_lf(enum log_levels level, const char *file, int line,
+       const char *function, const char *format, ...) 
+__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 *priv, const char *file, int line, 
-               const char *function, const char *format, va_list args);
+typedef void (*log_callback_fn)(void *priv, const char *file, int line,
+               const char *function, const char *string);
+
+typedef struct log_callback_s
+{
+       log_callback_fn fn;
+       void *priv;
+       struct log_callback_s *next;
+} log_callback_t;
 
-extern void log_setCallback(logCallback callback, void *priv);         
+extern int log_add_callback(log_callback_fn fn, void *priv);
+extern int log_remove_callback(log_callback_fn fn, void *priv);
+
+char *alloc_printf(const char *fmt, va_list ap);
 
 extern int debug_level;
 
 /* Avoid fn call and building parameter list if we're not outputting the information.
  * Matters on feeble CPUs for DEBUG/INFO statements that are involved frequently */
 
+
 #define DEBUG(expr ...) \
-       do { if (debug_level >= LOG_DEBUG) \
-               log_printf (LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr); \
-       } while(0)
+               log_printf_lf (LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr)
 
 #define INFO(expr ...) \
-       do { if (debug_level >= LOG_INFO) \
-               log_printf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \
-       } while(0)
+               log_printf_lf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr)
+
+#define INFO_N(expr ...) \
+               log_printf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr)
 
 #define WARNING(expr ...) \
-       do { \
-               log_printf (LOG_WARNING, __FILE__, __LINE__, __FUNCTION__, expr); \
-       } while(0)
+               log_printf_lf (LOG_WARNING, __FILE__, __LINE__, __FUNCTION__, expr)
 
 #define ERROR(expr ...) \
-       do { \
-               log_printf (LOG_ERROR, __FILE__, __LINE__, __FUNCTION__, expr); \
-       } while(0)
+               log_printf_lf (LOG_ERROR, __FILE__, __LINE__, __FUNCTION__, expr)
 
 #define USER(expr ...) \
-       do { \
-               log_printf (LOG_USER, __FILE__, __LINE__, __FUNCTION__, expr); \
-       } while(0)
+               log_printf_lf (LOG_USER, __FILE__, __LINE__, __FUNCTION__, expr)
+
+#define USER_N(expr ...) \
+               log_printf (LOG_USER, __FILE__, __LINE__, __FUNCTION__, expr)
+
+#define OUTPUT(expr ...) \
+               log_printf (LOG_OUTPUT, __FILE__, __LINE__, __FUNCTION__, expr)
 
 
 /* general failures
@@ -94,6 +108,4 @@ extern int debug_level;
 #define ERROR_NO_CONFIG_FILE           (-2)
 #define ERROR_BUF_TOO_SMALL                    (-3)
 
-char *allocPrintf(const char *fmt, va_list ap);
-
 #endif /* LOG_H */