diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-30 14:31:21 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-06 10:49:52 +0000 |
| commit | 8b00e56e6433cff3ff818835953b27765aaabab0 (patch) | |
| tree | 168a9feec9fb8735c7561fccf1856d796587d9c8 /src/helper/log.h | |
| parent | 9ad57e96b3c15c3dfbaa908abc842f264648ab55 (diff) | |
| download | riscv-openocd-8b00e56e6433cff3ff818835953b27765aaabab0.zip riscv-openocd-8b00e56e6433cff3ff818835953b27765aaabab0.tar.gz riscv-openocd-8b00e56e6433cff3ff818835953b27765aaabab0.tar.bz2 | |
build: cleanup src/helper directory
Change-Id: I71a312df783995e9083c345c25e73902d5aef59e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/415
Tested-by: jenkins
Diffstat (limited to 'src/helper/log.h')
| -rw-r--r-- | src/helper/log.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/helper/log.h b/src/helper/log.h index 7edfa7b..e161a6e 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -23,6 +23,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef ERROR_H #define ERROR_H @@ -48,8 +49,7 @@ * LOG_LVL_INFO - state information, etc. * LOG_LVL_DEBUG - debug statements, execution trace */ -enum log_levels -{ +enum log_levels { LOG_LVL_SILENT = -3, LOG_LVL_OUTPUT = -2, LOG_LVL_USER = -1, @@ -60,10 +60,10 @@ enum log_levels }; void log_printf(enum log_levels level, const char *file, unsigned line, - const char *function, const char *format, ...) + const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); void log_printf_lf(enum log_levels level, const char *file, unsigned line, - const char *function, const char *format, ...) + const char *function, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6))); /** @@ -103,40 +103,40 @@ extern int debug_level; #define LOG_LEVEL_IS(FOO) ((debug_level) >= (FOO)) #define LOG_DEBUG(expr ...) \ - do { \ - if (debug_level >= LOG_LVL_DEBUG) \ - log_printf_lf(LOG_LVL_DEBUG, \ - __FILE__, __LINE__, __func__, \ - expr); \ - } while (0) + do { \ + if (debug_level >= LOG_LVL_DEBUG) \ + log_printf_lf(LOG_LVL_DEBUG, \ + __FILE__, __LINE__, __func__, \ + expr); \ + } while (0) #define LOG_INFO(expr ...) \ - log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf_lf(LOG_LVL_INFO, __FILE__, __LINE__, __func__, expr) #define LOG_WARNING(expr ...) \ - log_printf_lf (LOG_LVL_WARNING, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf_lf(LOG_LVL_WARNING, __FILE__, __LINE__, __func__, expr) #define LOG_ERROR(expr ...) \ - log_printf_lf (LOG_LVL_ERROR, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf_lf(LOG_LVL_ERROR, __FILE__, __LINE__, __func__, expr) #define LOG_USER(expr ...) \ - log_printf_lf (LOG_LVL_USER, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf_lf(LOG_LVL_USER, __FILE__, __LINE__, __func__, expr) #define LOG_USER_N(expr ...) \ - log_printf (LOG_LVL_USER, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf(LOG_LVL_USER, __FILE__, __LINE__, __func__, expr) #define LOG_OUTPUT(expr ...) \ - log_printf (LOG_LVL_OUTPUT, __FILE__, __LINE__, __FUNCTION__, expr) + log_printf(LOG_LVL_OUTPUT, __FILE__, __LINE__, __func__, expr) /* general failures * error codes < 100 */ -#define ERROR_OK (0) -#define ERROR_NO_CONFIG_FILE (-2) -#define ERROR_BUF_TOO_SMALL (-3) +#define ERROR_OK (0) +#define ERROR_NO_CONFIG_FILE (-2) +#define ERROR_BUF_TOO_SMALL (-3) /* see "Error:" log entry for meaningful message to the user. The caller should * make no assumptions about what went wrong and try to handle the problem. */ -#define ERROR_FAIL (-4) +#define ERROR_FAIL (-4) -#endif /* LOG_H */ +#endif /* LOG_H */ |