From d0373bd9c30115993b43941b85bffab2e756619e Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Wed, 5 Mar 2003 16:02:38 +0000 Subject: [PATCH] Correct returning of FALSE to NULL in functions which return pointer; (bug 2003-03-05 Padraig O'Briain * atk/atk-relation.c atk/atkrelationset.c atk/atkstatset.c: Correct returning of FALSE to NULL in functions which return pointer; (bug #107650) reported by Morten Welinder. --- ChangeLog | 7 +++++++ atk/atkrelation.c | 2 +- atk/atkrelationset.c | 4 ++-- atk/atkstateset.c | 12 ++++++------ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c9d866..daa494d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-03-05 Padraig O'Briain + + * atk/atk-relation.c + atk/atkrelationset.c + atk/atkstatset.c: Correct returning of FALSE to NULL in functions + which return pointer; (bug #107650) reported by Morten Welinder. + 2003-02-26 Padraig O'Briain * test/Makefile.am: Update to produce .so files diff --git a/atk/atkrelation.c b/atk/atkrelation.c index a9d5f75..7b60660 100755 --- a/atk/atkrelation.c +++ b/atk/atkrelation.c @@ -285,7 +285,7 @@ atk_relation_get_relation_type (AtkRelation *relation) GPtrArray* atk_relation_get_target (AtkRelation *relation) { - g_return_val_if_fail (ATK_IS_RELATION (relation), FALSE); + g_return_val_if_fail (ATK_IS_RELATION (relation), NULL); return relation->target; } diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c index 40bf487..d8271c7 100755 --- a/atk/atkrelationset.c +++ b/atk/atkrelationset.c @@ -197,7 +197,7 @@ atk_relation_set_get_relation (AtkRelationSet *set, GPtrArray *array_item; AtkRelation* item; - g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); + g_return_val_if_fail (ATK_IS_RELATION_SET (set), NULL); g_return_val_if_fail (i >= 0, NULL); array_item = set->relations; @@ -227,7 +227,7 @@ atk_relation_set_get_relation_by_type (AtkRelationSet *set, AtkRelation *item; gint i; - g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); + g_return_val_if_fail (ATK_IS_RELATION_SET (set), NULL); array_item = set->relations; if (array_item == NULL) diff --git a/atk/atkstateset.c b/atk/atkstateset.c index eba179a..0daf9e6 100755 --- a/atk/atkstateset.c +++ b/atk/atkstateset.c @@ -267,8 +267,8 @@ atk_state_set_and_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state; - g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); + g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); + g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); real_set = (AtkRealStateSet *)set; real_compare_set = (AtkRealStateSet *)compare_set; @@ -300,8 +300,8 @@ atk_state_set_or_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state; - g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); + g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); + g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); real_set = (AtkRealStateSet *)set; real_compare_set = (AtkRealStateSet *)compare_set; @@ -334,8 +334,8 @@ atk_state_set_xor_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state, state1, state2; - g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); + g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); + g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); real_set = (AtkRealStateSet *)set; real_compare_set = (AtkRealStateSet *)compare_set; -- 2.7.4