From dc8cf867c805095b7acd7842b731c6eff32ee18f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Jul 2010 07:50:36 -0400 Subject: [PATCH] Don't return FALSE when a pointer is expected Pointed out in bug 623956 --- glib/gvariant-parser.c | 8 ++++---- glib/tests/markup-subparser.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c index 68c063d..13d8e22 100644 --- a/glib/gvariant-parser.c +++ b/glib/gvariant-parser.c @@ -1218,7 +1218,7 @@ dictionary_get_value (AST *ast, if (!(subvalue = ast_get_value (dict->keys[0], subtype, error))) { g_variant_builder_clear (&builder); - return FALSE; + return NULL; } g_variant_builder_add_value (&builder, subvalue); @@ -1226,7 +1226,7 @@ dictionary_get_value (AST *ast, if (!(subvalue = ast_get_value (dict->values[0], subtype, error))) { g_variant_builder_clear (&builder); - return FALSE; + return NULL; } g_variant_builder_add_value (&builder, subvalue); @@ -1256,14 +1256,14 @@ dictionary_get_value (AST *ast, if (!(subvalue = ast_get_value (dict->keys[i], key, error))) { g_variant_builder_clear (&builder); - return FALSE; + return NULL; } g_variant_builder_add_value (&builder, subvalue); if (!(subvalue = ast_get_value (dict->values[i], val, error))) { g_variant_builder_clear (&builder); - return FALSE; + return NULL; } g_variant_builder_add_value (&builder, subvalue); g_variant_builder_close (&builder); diff --git a/glib/tests/markup-subparser.c b/glib/tests/markup-subparser.c index 0b3c746..b766ddf 100644 --- a/glib/tests/markup-subparser.c +++ b/glib/tests/markup-subparser.c @@ -149,7 +149,7 @@ replay_parser_end (GMarkupParseContext *ctx, g_string_free (string, TRUE); strings_allocated--; - return FALSE; + return NULL; } result = string->str; -- 2.7.4