summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 14:28:37 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 14:28:37 +0000
commit2d48f25dcfc61c23de05b4eb897b17fcae3b9af2 (patch)
tree429fcd41f4075e9f9bbbe14c0fa9f2c9574fbccf /src/helper
parent0db9f18a18cfd9c679afa4862e3328caa12f17d7 (diff)
downloadopenocd+libswd-2d48f25dcfc61c23de05b4eb897b17fcae3b9af2.tar.gz
openocd+libswd-2d48f25dcfc61c23de05b4eb897b17fcae3b9af2.tar.bz2
openocd+libswd-2d48f25dcfc61c23de05b4eb897b17fcae3b9af2.tar.xz
openocd+libswd-2d48f25dcfc61c23de05b4eb897b17fcae3b9af2.zip
Pavel Chromy spotted duplicated newlines gaffe from yours sincerely.
git-svn-id: svn://svn.berlios.de/openocd/trunk@381 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/log.h5
-rw-r--r--src/helper/options.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/helper/log.h b/src/helper/log.h
index 48b43d8e..624aa29c 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 30dad17d..6e1f10b7 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;
}