Fix token parsing in midori_debug

This commit is contained in:
Christian Dywan 2012-09-01 17:58:35 +02:00
parent 373ddd5d0b
commit 64c9517459

View file

@ -1465,7 +1465,7 @@ midori_debug (const gchar* token)
if (debug_token == NULL) if (debug_token == NULL)
{ {
gchar* found_token; gchar* found_token;
if (debug && (found_token = strstr (full_debug_tokens, debug)) && *found_token == ' ') if (debug && (found_token = strstr (full_debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
{ {
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
debug_token = g_intern_static_string (debug); debug_token = g_intern_static_string (debug);
@ -1473,7 +1473,7 @@ midori_debug (const gchar* token)
g_warning ("Value '%s' for MIDORI_DEBUG requires a full debugging build.", debug); g_warning ("Value '%s' for MIDORI_DEBUG requires a full debugging build.", debug);
#endif #endif
} }
else if (debug && (found_token = strstr (debug_tokens, debug)) && *found_token == ' ') else if (debug && (found_token = strstr (debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
debug_token = g_intern_static_string (debug); debug_token = g_intern_static_string (debug);
else if (debug) else if (debug)
g_warning ("Unrecognized value '%s' for MIDORI_DEBUG.", debug); g_warning ("Unrecognized value '%s' for MIDORI_DEBUG.", debug);