diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:35:11 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:35:11 +0000 |
| commit | 882bde74f68e5e938a5cecb1b210d4935110b55d (patch) | |
| tree | 49a2e1c6ea5617f9ff86e92dad337249891bb579 /navit | |
| parent | 0590855bf2a25d587c76a9f8d16463194ef788b8 (diff) | |
| download | navit-svn-882bde74f68e5e938a5cecb1b210d4935110b55d.tar.gz | |
Refactor:core:Introduce #define DEFAULT_DEBUG_LEVEL|#1269, part 3
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5964 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/debug.c | 19 | ||||
| -rw-r--r-- | navit/debug.h | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/navit/debug.c b/navit/debug.c index 0d990435..664acdca 100644 --- a/navit/debug.c +++ b/navit/debug.c @@ -52,7 +52,8 @@ static struct sockaddr_in debug_sin; #endif -dbg_level debug_level=lvl_error; +#define DEFAULT_DEBUG_LEVEL lvl_error +dbg_level max_debug_level=DEFAULT_DEBUG_LEVEL; #define GLOBAL_DEBUG_LEVEL_UNSET lvl_unset dbg_level global_debug_level=GLOBAL_DEBUG_LEVEL_UNSET; int segv_level=0; @@ -101,16 +102,16 @@ debug_init(const char *program_name) static void debug_update_level(gpointer key, gpointer value, gpointer user_data) { - if (debug_level < GPOINTER_TO_INT(value)) - debug_level = GPOINTER_TO_INT(value); + if (max_debug_level < GPOINTER_TO_INT(value)) + max_debug_level = GPOINTER_TO_INT(value); } void debug_set_global_level(dbg_level level, int override_old_value ) { if (global_debug_level == GLOBAL_DEBUG_LEVEL_UNSET || override_old_value) { global_debug_level=level; - if (debug_level < global_debug_level){ - debug_level = global_debug_level; + if (max_debug_level < global_debug_level){ + max_debug_level = global_debug_level; } } } @@ -176,8 +177,12 @@ dbg_level debug_level_get(const char *message_category) { if (!debug_hash) - return lvl_error; - return GPOINTER_TO_INT(g_hash_table_lookup(debug_hash, message_category)); + return DEFAULT_DEBUG_LEVEL; + gpointer level = g_hash_table_lookup(debug_hash, message_category); + if (!level) { + return DEFAULT_DEBUG_LEVEL; + } + return GPOINTER_TO_INT(level); } static void debug_timestamp(char *buffer) diff --git a/navit/debug.h b/navit/debug.h index a42de4a7..49f19566 100644 --- a/navit/debug.h +++ b/navit/debug.h @@ -52,11 +52,11 @@ typedef enum { lvl_debug } dbg_level; -extern dbg_level debug_level; +extern dbg_level max_debug_level; #define dbg_str2(x) #x #define dbg_str1(x) dbg_str2(x) #define dbg_module dbg_str1(MODULE) -#define dbg(level,...) { if (debug_level >= level) debug_printf(level,dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),1,__VA_ARGS__); } +#define dbg(level,...) { if (max_debug_level >= level) debug_printf(level,dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),1,__VA_ARGS__); } #define dbg_assert(expr) ((expr) ? (void) 0 : debug_assert_fail(dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),__FILE__,__LINE__,dbg_str1(expr))) #define DEBUG_MODULE_GLOBAL "global" |