From 7faf7764c8b99bd51e952f24350dcdb05f9ab78e Mon Sep 17 00:00:00 2001 From: Dmitri Pal Date: Fri, 16 Oct 2009 23:23:38 -0400 Subject: COMMON Improvements to the trace macro Added more distingushable indication to the trace messages that represent errors. --- common/trace/trace.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/common/trace/trace.h b/common/trace/trace.h index b2604fd5..c7e375b7 100644 --- a/common/trace/trace.h +++ b/common/trace/trace.h @@ -44,9 +44,11 @@ extern unsigned trace_level; #define TRACE_STRING(level, msg, str) \ do { \ if (level & trace_level) { \ - printf("[DEBUG] %23s (%4d) %s %s\n", \ - __FILE__, __LINE__, (msg != NULL) ? msg : "MISSING MESSAGE", \ - (str != NULL) ? str : "(null)"); \ + printf("[DEBUG] %40s (%4d) %s%s %s\n", \ + __FILE__, __LINE__, \ + (level == TRACE_ERROR) ? "ERROR-> " : "", \ + (msg != NULL) ? msg : "MISSING MESSAGE", \ + (str != NULL) ? str : "(null)"); \ } \ } while(0) @@ -54,9 +56,11 @@ extern unsigned trace_level; #define TRACE_NUMBER(level, msg, num) \ do { \ if (level & trace_level) { \ - printf("[DEBUG] %23s (%4d) %s %lu\n", \ - __FILE__, __LINE__, (msg != NULL) ? msg : "MISSING MESSAGE", \ - (unsigned long int)(num)); \ + printf("[DEBUG] %40s (%4d) %s%s %lu\n", \ + __FILE__, __LINE__, \ + (level == TRACE_ERROR) ? "ERROR-> " : "", \ + (msg != NULL) ? msg : "MISSING MESSAGE", \ + (unsigned long int)(num)); \ } \ } while(0) @@ -64,9 +68,11 @@ extern unsigned trace_level; #define TRACE_DOUBLE(level, msg, num) \ do { \ if (level & trace_level) { \ - printf("[DEBUG] %23s (%4d) %s %e\n", \ - __FILE__, __LINE__, (msg != NULL) ? msg : "MISSING MESSAGE", \ - (double)(num)); \ + printf("[DEBUG] %40s (%4d) %s%s %e\n", \ + __FILE__, __LINE__, \ + (level == TRACE_ERROR) ? "ERROR-> " : "", \ + (msg != NULL) ? msg : "MISSING MESSAGE", \ + (double)(num)); \ } \ } while(0) -- cgit