From 9f8d50bf81f3628b3ff3b57438eeb26faa535221 Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 4 Jun 2008 11:09:41 +0000 Subject: Pavel Chromy: fix logging syntax error + formatting & removing obsolete comments. git-svn-id: svn://svn.berlios.de/openocd/trunk@702 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/configuration.c | 2 +- src/helper/log.h | 2 +- src/jtag/jtag.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helper/configuration.c b/src/helper/configuration.c index fb5b797e..2d84d9e6 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -84,7 +84,7 @@ FILE *open_file_from_path (char *file, char *mode) } if (fp) - LOG_DEBUG("opened %s", full_path); + LOG_DEBUG("opened %s", full_path); return fp; } diff --git a/src/helper/log.h b/src/helper/log.h index 6d61cf5f..37490a86 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -80,7 +80,7 @@ extern int debug_level; #define LOG_DEBUG(expr ...) \ - if (debug_level >= LOG_LVL_DEBUG) { log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr); } + ((debug_level >= LOG_LVL_DEBUG) ? log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr) , 0 : 0) #define LOG_INFO(expr ...) \ log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index cd4b255a..3a1fbae9 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1236,7 +1236,7 @@ void jtag_set_check_value(scan_field_t *field, u8 *value, u8 *mask, error_handle field->in_handler = jtag_check_value; else field->in_handler = NULL; /* No check, e.g. embeddedice uses value==NULL to indicate no check */ - field->in_handler_priv = NULL; /* this will be filled in at the invocation site to point to the field duplicate */ + field->in_handler_priv = NULL; field->in_check_value = value; field->in_check_mask = mask; } -- cgit v1.2.3