From 0bbccfde3449c9ad69b3ab4042c2ca8ab3725f11 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jan 2008 22:19:21 +0100 Subject: [PATCH] cleanup include/my_dbug.h: formatting --- dbug/dbug.c | 1 - include/my_dbug.h | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dbug/dbug.c b/dbug/dbug.c index 9c92fcc9a7e..c40739913f7 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -951,7 +951,6 @@ void _db_enter_(const char *_func_, const char *_file_, *_slevel_= 0; /* Set to avoid valgrind warnings if dbug is enabled later */ return; } - get_code_state_or_return; save_errno= errno; *_sfunc_= cs->func; diff --git a/include/my_dbug.h b/include/my_dbug.h index 8c0df771ff2..ff78bbad0d8 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -81,20 +81,20 @@ extern FILE *_db_fp_(void); #define DBUG_ASSERT(A) assert(A) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) -#define DEBUGGER_OFF _dbug_on_= 0 -#define DEBUGGER_ON _dbug_on_= 1 +#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) +#define DEBUGGER_ON do { _dbug_on_= 1; } while(0) #define IF_DBUG(A) A #else /* No debugger */ #define DBUG_ENTER(a1) #define DBUG_LEAVE -#define DBUG_RETURN(a1) do { return(a1); } while(0) -#define DBUG_VOID_RETURN do { return; } while(0) -#define DBUG_EXECUTE(keyword,a1) do { } while(0) -#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0) +#define DBUG_RETURN(a1) do { return(a1); } while(0) +#define DBUG_VOID_RETURN do { return; } while(0) +#define DBUG_EXECUTE(keyword,a1) do { } while(0) +#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0) #define DBUG_EVALUATE(keyword,a1,a2) (a2) #define DBUG_EVALUATE_IF(keyword,a1,a2) (a2) -#define DBUG_PRINT(keyword,arglist) do { } while(0) +#define DBUG_PRINT(keyword,arglist) do { } while(0) #define DBUG_PUSH(a1) #define DBUG_SET(a1) #define DBUG_SET_INITIAL(a1) @@ -104,14 +104,14 @@ extern FILE *_db_fp_(void); #define DBUG_LONGJMP(a1) longjmp(a1) #define DBUG_DUMP(keyword,a1,a2) #define DBUG_END() -#define DBUG_ASSERT(A) do { } while(0) +#define DBUG_ASSERT(A) do { } while(0) #define DBUG_LOCK_FILE #define DBUG_FILE (stderr) -#define DEBUGGER_OFF -#define DEBUGGER_ON #define DBUG_UNLOCK_FILE #define DBUG_EXPLAIN(buf,len) #define DBUG_EXPLAIN_INITIAL(buf,len) +#define DEBUGGER_OFF do { } while(0) +#define DEBUGGER_ON do { } while(0) #define IF_DBUG(A) #endif #ifdef __cplusplus