From 2d48f25dcfc61c23de05b4eb897b17fcae3b9af2 Mon Sep 17 00:00:00 2001 From: oharboe Date: Thu, 28 Feb 2008 14:28:37 +0000 Subject: [PATCH] Pavel Chromy spotted duplicated newlines gaffe from yours sincerely. git-svn-id: svn://svn.berlios.de/openocd/trunk@381 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/log.h | 5 +++++ src/helper/options.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/helper/log.h b/src/helper/log.h index 48b43d8ec..624aa29ce 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -85,6 +85,11 @@ extern int debug_level; log_printfnl (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \ } while(0) +#define INFO_SAMELINE(expr ...) \ + do { if (debug_level >= LOG_INFO) \ + log_printf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \ + } while(0) + #define WARNING(expr ...) \ do { \ log_printfnl (LOG_WARNING, __FILE__, __LINE__, __FUNCTION__, expr); \ diff --git a/src/helper/options.c b/src/helper/options.c index 30dad17dd..6e1f10b77 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -48,7 +48,7 @@ static struct option long_options[] = int configuration_output_handler(struct command_context_s *context, char* line) { - INFO(line); + INFO_SAMELINE(line); return ERROR_OK; }