Imported Upstream version 0.1.17

[platform/upstream/libnice.git] / agent / debug.c

diff --git a/agent/debug.c b/agent/debug.c
index 84fee94..08ffb07 100644 (file)
--- a/agent/debug.c
+++ b/agent/debug.c
@@ -61,8 +61,7 @@ static const GDebugKey keys[] = {
   { (gchar *)"nice",  NICE_DEBUG_NICE },
   { (gchar *)"pseudotcp",  NICE_DEBUG_PSEUDOTCP },
   { (gchar *)"pseudotcp-verbose",  NICE_DEBUG_PSEUDOTCP_VERBOSE },
-  { (gchar *)"nice-verbose",  NICE_DEBUG_NICE_VERBOSE },
-  { NULL, 0},
+  { (gchar *)"nice-verbose",  NICE_DEBUG_NICE_VERBOSE }
 };
 
 static const GDebugKey gkeys[] = {
@@ -70,8 +69,7 @@ static const GDebugKey gkeys[] = {
   { (gchar *)"libnice",  NICE_DEBUG_NICE },
   { (gchar *)"libnice-pseudotcp",  NICE_DEBUG_PSEUDOTCP },
   { (gchar *)"libnice-pseudotcp-verbose",  NICE_DEBUG_PSEUDOTCP_VERBOSE },
-  { (gchar *)"libnice-verbose",  NICE_DEBUG_NICE_VERBOSE },
-  { NULL, 0},
+  { (gchar *)"libnice-verbose",  NICE_DEBUG_NICE_VERBOSE }
 };
 
 static void
@@ -97,9 +95,9 @@ void nice_debug_init (void)
     gflags_string = g_getenv ("G_MESSAGES_DEBUG");
 
     if (flags_string)
-      flags = g_parse_debug_string (flags_string, keys,  4);
+      flags = g_parse_debug_string (flags_string, keys, G_N_ELEMENTS (keys));
     if (gflags_string)
-      flags |= g_parse_debug_string (gflags_string, gkeys,  4);
+      flags |= g_parse_debug_string (gflags_string, gkeys, G_N_ELEMENTS (gkeys));
     if (gflags_string && strstr (gflags_string, "libnice-pseudotcp-verbose"))
       flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
     if (gflags_string && strstr (gflags_string, "libnice-verbose")) {
@@ -167,7 +165,7 @@ void nice_debug (const char *fmt, ...)
 void nice_debug_verbose (const char *fmt, ...)
 {
   va_list ap;
-  if (debug_verbose_enabled) {
+  if (debug_enabled && debug_verbose_enabled) {
     va_start (ap, fmt);
     g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, fmt, ap);
     va_end (ap);