From 72a3a8f71003d40087c59371d07df5b59f2df3a7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 16 May 2013 10:16:02 +0100 Subject: debug: Clean up debug flags accessor Mark json_get_debug_flags() as an internal function, and drop the '_' prefix; also, add a simple macro that we can use everywhere to mask the function call. --- json-glib/json-debug.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'json-glib/json-debug.h') diff --git a/json-glib/json-debug.h b/json-glib/json-debug.h index 695917f..03ea96b 100644 --- a/json-glib/json-debug.h +++ b/json-glib/json-debug.h @@ -11,12 +11,14 @@ typedef enum { JSON_DEBUG_PATH = 1 << 2 } JsonDebugFlags; +#define JSON_HAS_DEBUG(flag) (json_get_debug_flags () & JSON_DEBUG_##flag) + #ifdef JSON_ENABLE_DEBUG # ifdef __GNUC__ # define JSON_NOTE(type,x,a...) G_STMT_START { \ - if (_json_get_debug_flags () & JSON_DEBUG_##type) { \ + if (JSON_HAS_DEBUG (type)) { \ g_message ("[" #type "] " G_STRLOC ": " x, ##a); \ } } G_STMT_END @@ -26,7 +28,7 @@ typedef enum { * do an intemediate printf. */ # define JSON_NOTE(type,...) G_STMT_START { \ - if (_json_get_debug_flags () & JSON_DEBUG_##type) { \ + if (JSON_HAS_DEBUG (type)) { \ gchar * _fmt = g_strdup_printf (__VA_ARGS__); \ g_message ("[" #type "] " G_STRLOC ": %s",_fmt); \ g_free (_fmt); \ @@ -40,7 +42,8 @@ typedef enum { #endif /* JSON_ENABLE_DEBUG */ -JsonDebugFlags _json_get_debug_flags (void); +G_GNUC_INTERNAL +JsonDebugFlags json_get_debug_flags (void); G_END_DECLS -- cgit v1.2.1