X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Flog.h;h=6f7c24a80bb40f361381aaa7dfa6b97ae9822d4f;hb=7a67aae93c7de1e72baaba65635af0461ad8d040;hp=aabd1be250c2a40efa29819ec2e317f814c6b406;hpb=6a2e83c01719cada03eb3bd13dc51d21d8bc964f;p=openocd.git diff --git a/src/helper/log.h b/src/helper/log.h index aabd1be250..6f7c24a80b 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -59,23 +59,23 @@ enum log_levels LOG_LVL_DEBUG = 3 }; -void log_printf(enum log_levels level, const char *file, int line, +void log_printf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); -void log_printf_lf(enum log_levels level, const char *file, int line, +void log_printf_lf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); -int log_init(struct command_context_s *cmd_ctx); -int set_log_output(struct command_context_s *cmd_ctx, FILE *output); +int log_init(struct command_context *cmd_ctx); +int set_log_output(struct command_context *cmd_ctx, FILE *output); -int log_register_commands(struct command_context_s *cmd_ctx); +int log_register_commands(struct command_context *cmd_ctx); void keep_alive(void); void kept_alive(void); -void alive_sleep(int ms); -void busy_sleep(int ms); +void alive_sleep(uint64_t ms); +void busy_sleep(uint64_t ms); /* log entries can be paused and replayed roughly according to the try/catch/rethrow * concepts in C++ @@ -88,12 +88,11 @@ void log_rethrow(void); typedef void (*log_callback_fn)(void *priv, const char *file, unsigned line, const char *function, const char *string); -typedef struct log_callback_s -{ +struct log_callback { log_callback_fn fn; void *priv; - struct log_callback_s *next; -} log_callback_t; + struct log_callback *next; +}; int log_add_callback(log_callback_fn fn, void *priv); int log_remove_callback(log_callback_fn fn, void *priv);