[glib] Fix backward logic in g_return_if_fail().



commit 1f66523ad325c301d9caf7130b99d3fd74940338
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Feb 23 02:00:11 2010 -0500

    Fix backward logic in g_return_if_fail().

 glib/gvariant.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/glib/gvariant.c b/glib/gvariant.c
index c28dde9..b54cd89 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -2513,9 +2513,9 @@ g_variant_builder_add_value (GVariantBuilder *builder,
   g_return_if_fail (builder != NULL && value != NULL);
   g_return_if_fail (builder->is_active && !builder->has_child);
   g_return_if_fail (builder->offset < builder->max_items);
-  g_return_if_fail (builder->expected_type &&
+  g_return_if_fail (!builder->expected_type ||
                     g_variant_is_of_type (value, builder->expected_type));
-  g_return_if_fail (builder->prev_item_type &&
+  g_return_if_fail (!builder->prev_item_type ||
                     g_variant_is_of_type (value, builder->prev_item_type));
 
   builder->trusted &= g_variant_is_trusted (value);
@@ -2567,11 +2567,11 @@ g_variant_builder_open (GVariantBuilder    *builder,
   g_return_val_if_fail (builder != NULL && type != NULL, NULL);
   g_return_val_if_fail (builder->is_active && !builder->has_child, NULL);
   g_return_val_if_fail (builder->offset < builder->max_items, NULL);
-  g_return_val_if_fail (builder->expected_type &&
+  g_return_val_if_fail (!builder->expected_type ||
                         g_variant_type_is_subtype_of (type,
                                                       builder->expected_type),
                         NULL);
-  g_return_val_if_fail (builder->prev_item_type &&
+  g_return_val_if_fail (!builder->prev_item_type ||
                         g_variant_type_is_subtype_of (builder->prev_item_type,
                                                       type), NULL);
   child = g_variant_builder_new (type);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]