From 212877c783b8d2bec1eeba23369391a7c55d9108 Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Fri, 27 Jul 2001 08:33:35 +0000 Subject: [PATCH] Remove all instances of g_return_if_fail (foo != NULL); that are * atk/*.c: Remove all instances of g_return_if_fail (foo != NULL); that are immediately before a g_return_if_fail (ATK_IS_FOO (foo)); since the second check catches the NULL. --- ChangeLog | 7 +++++++ atk/atkcomponent.c | 4 ---- atk/atkdocument.c | 2 -- atk/atkeditabletext.c | 7 ------- atk/atkhyperlink.c | 6 ------ atk/atkhypertext.c | 3 --- atk/atkimage.c | 4 ---- atk/atkobject.c | 16 ---------------- atk/atkobjectfactory.c | 3 --- atk/atkregistry.c | 1 - atk/atkrelation.c | 2 -- atk/atkrelationset.c | 7 ------- atk/atkselection.c | 7 ------- atk/atkstateset.c | 13 ------------- atk/atkstreamablecontent.c | 3 --- atk/atktable.c | 29 ----------------------------- atk/atktext.c | 16 ---------------- atk/atkvalue.c | 5 ----- 18 files changed, 7 insertions(+), 128 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb68bd7..35dd2ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-07-27 Padraig O'Briain + + * atk/*.c: + Remove all instances of g_return_if_fail (foo != NULL); that are + immediately before a g_return_if_fail (ATK_IS_FOO (foo)); + since the second check catches the NULL. + 2001-07-26 Padraig O'Briain * atk/Makefile.am diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c index 60e8fa1..d68013f 100755 --- a/atk/atkcomponent.c +++ b/atk/atkcomponent.c @@ -86,7 +86,6 @@ atk_component_remove_focus_handler (AtkComponent *component, guint handler_id) { AtkComponentIface *iface = NULL; - g_return_if_fail (component != NULL); g_return_if_fail (ATK_IS_COMPONENT (component)); iface = ATK_COMPONENT_GET_IFACE (component); @@ -184,7 +183,6 @@ atk_component_get_extents (AtkComponent *component, AtkCoordType coord_type) { AtkComponentIface *iface = NULL; - g_return_if_fail (component != NULL); g_return_if_fail (ATK_IS_COMPONENT (component)); iface = ATK_COMPONENT_GET_IFACE (component); @@ -211,7 +209,6 @@ atk_component_get_position (AtkComponent *component, AtkCoordType coord_type) { AtkComponentIface *iface = NULL; - g_return_if_fail (component != NULL); g_return_if_fail (ATK_IS_COMPONENT (component)); iface = ATK_COMPONENT_GET_IFACE (component); @@ -234,7 +231,6 @@ atk_component_get_size (AtkComponent *component, gint *y) { AtkComponentIface *iface = NULL; - g_return_if_fail (component != NULL); g_return_if_fail (ATK_IS_COMPONENT (component)); iface = ATK_COMPONENT_GET_IFACE (component); diff --git a/atk/atkdocument.c b/atk/atkdocument.c index ae90ff0..564a403 100755 --- a/atk/atkdocument.c +++ b/atk/atkdocument.c @@ -52,7 +52,6 @@ atk_document_get_document_type (AtkDocument *document) { AtkDocumentIface *iface; - g_return_val_if_fail (document != NULL, NULL); g_return_val_if_fail (ATK_IS_DOCUMENT (document), NULL); iface = ATK_DOCUMENT_GET_IFACE (document); @@ -82,7 +81,6 @@ atk_document_get_document (AtkDocument *document) { AtkDocumentIface *iface; - g_return_val_if_fail (document != NULL, NULL); g_return_val_if_fail (ATK_IS_DOCUMENT (document), NULL); iface = ATK_DOCUMENT_GET_IFACE (document); diff --git a/atk/atkeditabletext.c b/atk/atkeditabletext.c index 45e0351..f23b8fa 100755 --- a/atk/atkeditabletext.c +++ b/atk/atkeditabletext.c @@ -70,7 +70,6 @@ atk_editable_text_set_run_attributes (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_val_if_fail (text != NULL, FALSE); g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (text), FALSE); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -99,7 +98,6 @@ atk_editable_text_set_text_contents (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -127,7 +125,6 @@ atk_editable_text_insert_text (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -152,7 +149,6 @@ atk_editable_text_copy_text (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -177,7 +173,6 @@ atk_editable_text_cut_text (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -201,7 +196,6 @@ atk_editable_text_delete_text (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); @@ -223,7 +217,6 @@ atk_editable_text_paste_text (AtkEditableText *text, { AtkEditableTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_EDITABLE_TEXT (text)); iface = ATK_EDITABLE_TEXT_GET_IFACE (text); diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c index 492eabb..fd4883d 100755 --- a/atk/atkhyperlink.c +++ b/atk/atkhyperlink.c @@ -92,7 +92,6 @@ atk_hyperlink_get_uri (AtkHyperlink *link, { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, NULL); g_return_val_if_fail (ATK_IS_HYPERLINK (link), NULL); klass = ATK_HYPERLINK_GET_CLASS (link); @@ -122,7 +121,6 @@ atk_hyperlink_get_object (AtkHyperlink *link, { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, NULL); g_return_val_if_fail (ATK_IS_HYPERLINK (link), NULL); klass = ATK_HYPERLINK_GET_CLASS (link); @@ -145,7 +143,6 @@ atk_hyperlink_get_end_index (AtkHyperlink *link) { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, 0); g_return_val_if_fail (ATK_IS_HYPERLINK (link), 0); klass = ATK_HYPERLINK_GET_CLASS (link); @@ -168,7 +165,6 @@ atk_hyperlink_get_start_index (AtkHyperlink *link) { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, 0); g_return_val_if_fail (ATK_IS_HYPERLINK (link), 0); klass = ATK_HYPERLINK_GET_CLASS (link); @@ -193,7 +189,6 @@ atk_hyperlink_is_valid (AtkHyperlink *link) { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, FALSE); g_return_val_if_fail (ATK_IS_HYPERLINK (link), FALSE); klass = ATK_HYPERLINK_GET_CLASS (link); @@ -216,7 +211,6 @@ atk_hyperlink_get_n_anchors (AtkHyperlink *link) { AtkHyperlinkClass *klass; - g_return_val_if_fail (link != NULL, 0); g_return_val_if_fail (ATK_IS_HYPERLINK (link), 0); klass = ATK_HYPERLINK_GET_CLASS (link); diff --git a/atk/atkhypertext.c b/atk/atkhypertext.c index 32da9f0..5def4fd 100755 --- a/atk/atkhypertext.c +++ b/atk/atkhypertext.c @@ -74,7 +74,6 @@ atk_hypertext_get_link (AtkHypertext *hypertext, { AtkHypertextIface *iface; - g_return_val_if_fail (hypertext != NULL, NULL); g_return_val_if_fail (ATK_IS_HYPERTEXT (hypertext), NULL); iface = ATK_HYPERTEXT_GET_IFACE (hypertext); @@ -98,7 +97,6 @@ atk_hypertext_get_n_links (AtkHypertext *hypertext) { AtkHypertextIface *iface; - g_return_val_if_fail (hypertext != NULL, 0); g_return_val_if_fail (ATK_IS_HYPERTEXT (hypertext), 0); iface = ATK_HYPERTEXT_GET_IFACE (hypertext); @@ -126,7 +124,6 @@ atk_hypertext_get_link_index (AtkHypertext *hypertext, { AtkHypertextIface *iface; - g_return_val_if_fail (hypertext != NULL, -1); g_return_val_if_fail (ATK_IS_HYPERTEXT (hypertext), -1); iface = ATK_HYPERTEXT_GET_IFACE (hypertext); diff --git a/atk/atkimage.c b/atk/atkimage.c index dc53bd8..8e9b7d4 100755 --- a/atk/atkimage.c +++ b/atk/atkimage.c @@ -52,7 +52,6 @@ atk_image_get_image_description (AtkImage *image) { AtkImageIface *iface; - g_return_val_if_fail (image != NULL, NULL); g_return_val_if_fail (ATK_IS_IMAGE (image), NULL); iface = ATK_IMAGE_GET_IFACE (image); @@ -80,7 +79,6 @@ atk_image_get_image_size (AtkImage *image, int *height, int *width) { AtkImageIface *iface; - g_return_if_fail (image != NULL); g_return_if_fail (ATK_IS_IMAGE (image)); iface = ATK_IMAGE_GET_IFACE (image); @@ -105,7 +103,6 @@ atk_image_set_image_description (AtkImage *image, { AtkImageIface *iface; - g_return_val_if_fail (image != NULL, FALSE); g_return_val_if_fail (ATK_IS_IMAGE (image), FALSE); iface = ATK_IMAGE_GET_IFACE (image); @@ -139,7 +136,6 @@ atk_image_get_position (AtkImage *image, { AtkImageIface *iface; - g_return_if_fail (image != NULL); g_return_if_fail (ATK_IS_IMAGE (image)); iface = ATK_IMAGE_GET_IFACE (image); diff --git a/atk/atkobject.c b/atk/atkobject.c index c2e53da..66ea6a1 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -401,7 +401,6 @@ atk_object_get_name (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -426,7 +425,6 @@ atk_object_get_description (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -449,7 +447,6 @@ atk_object_get_parent (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -473,7 +470,6 @@ atk_object_get_n_accessible_children (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, 0); g_return_val_if_fail (ATK_IS_OBJECT (accessible), 0); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -501,7 +497,6 @@ atk_object_ref_accessible_child (AtkObject *accessible, { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -524,7 +519,6 @@ atk_object_ref_relation_set (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -562,7 +556,6 @@ AtkRole atk_object_get_role (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, ATK_ROLE_UNKNOWN); g_return_val_if_fail (ATK_IS_OBJECT (accessible), ATK_ROLE_UNKNOWN); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -586,7 +579,6 @@ AtkStateSet* atk_object_ref_state_set (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, NULL); g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -610,7 +602,6 @@ atk_object_get_index_in_parent (AtkObject *accessible) { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, -1); g_return_val_if_fail (ATK_OBJECT (accessible), -1); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -633,7 +624,6 @@ atk_object_set_name (AtkObject *accessible, { AtkObjectClass *klass; - g_return_if_fail (accessible != NULL); g_return_if_fail (ATK_IS_OBJECT (accessible)); g_return_if_fail (name != NULL); @@ -658,7 +648,6 @@ atk_object_set_description (AtkObject *accessible, { AtkObjectClass *klass; - g_return_if_fail (accessible != NULL); g_return_if_fail (ATK_IS_OBJECT (accessible)); g_return_if_fail (description != NULL); @@ -683,7 +672,6 @@ atk_object_set_parent (AtkObject *accessible, { AtkObjectClass *klass; - g_return_if_fail (accessible != NULL); g_return_if_fail (ATK_IS_OBJECT (accessible)); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -704,7 +692,6 @@ atk_object_set_role (AtkObject *accessible, { AtkObjectClass *klass; - g_return_if_fail (accessible != NULL); g_return_if_fail (ATK_IS_OBJECT (accessible)); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -728,7 +715,6 @@ atk_object_connect_property_change_handler (AtkObject *accessible, { AtkObjectClass *klass; - g_return_val_if_fail (accessible != NULL, 0); g_return_val_if_fail (ATK_IS_OBJECT (accessible), 0); g_return_val_if_fail ((handler != NULL), 0); @@ -752,7 +738,6 @@ atk_object_remove_property_change_handler (AtkObject *accessible, { AtkObjectClass *klass; - g_return_if_fail (accessible != NULL); g_return_if_fail (ATK_IS_OBJECT (accessible)); klass = ATK_OBJECT_GET_CLASS (accessible); @@ -776,7 +761,6 @@ atk_implementor_ref_accessible (AtkImplementor *object) AtkImplementorIface *iface; AtkObject *accessible = NULL; - g_return_val_if_fail (object != NULL, NULL); g_return_val_if_fail (ATK_IS_IMPLEMENTOR (object), NULL); iface = ATK_IMPLEMENTOR_GET_IFACE (object); diff --git a/atk/atkobjectfactory.c b/atk/atkobjectfactory.c index 8006f30..75a82ae 100755 --- a/atk/atkobjectfactory.c +++ b/atk/atkobjectfactory.c @@ -75,9 +75,7 @@ atk_object_factory_create_accessible (AtkObjectFactory *factory, AtkObjectFactoryClass *klass; AtkObject *accessible = NULL; - g_return_val_if_fail ((factory != NULL), NULL); g_return_val_if_fail (ATK_IS_OBJECT_FACTORY (factory), NULL); - g_return_val_if_fail (obj != NULL, NULL); g_return_val_if_fail (G_IS_OBJECT (obj), NULL); klass = ATK_OBJECT_FACTORY_GET_CLASS (factory); @@ -104,7 +102,6 @@ atk_object_factory_invalidate (AtkObjectFactory *factory) { AtkObjectFactoryClass *klass; - g_return_if_fail (factory != NULL); g_return_if_fail (ATK_OBJECT_FACTORY (factory)); klass = ATK_OBJECT_FACTORY_GET_CLASS (factory); diff --git a/atk/atkregistry.c b/atk/atkregistry.c index 47526a3..fda1d5a 100644 --- a/atk/atkregistry.c +++ b/atk/atkregistry.c @@ -99,7 +99,6 @@ atk_registry_new () object = g_object_new (ATK_TYPE_REGISTRY, NULL); - g_return_val_if_fail (object != NULL, NULL); g_return_val_if_fail (ATK_IS_REGISTRY (object), NULL); return (AtkRegistry *) object; diff --git a/atk/atkrelation.c b/atk/atkrelation.c index 144523b..e248190 100755 --- a/atk/atkrelation.c +++ b/atk/atkrelation.c @@ -123,7 +123,6 @@ atk_relation_new (AtkObject **targets, AtkRelationType atk_relation_get_relation_type (AtkRelation *relation) { - g_return_val_if_fail (relation != NULL, 0); g_return_val_if_fail (ATK_IS_RELATION (relation), 0); return relation->relationship; @@ -140,7 +139,6 @@ atk_relation_get_relation_type (AtkRelation *relation) GPtrArray* atk_relation_get_target (AtkRelation *relation) { - g_return_val_if_fail (relation != NULL, FALSE); g_return_val_if_fail (ATK_IS_RELATION (relation), FALSE); return relation->target; diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c index 0724811..8cc2bc5 100755 --- a/atk/atkrelationset.c +++ b/atk/atkrelationset.c @@ -91,7 +91,6 @@ atk_relation_set_contains (AtkRelationSet *set, AtkRelation *item; gint i; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); array_item = set->relations; @@ -121,9 +120,7 @@ atk_relation_set_remove (AtkRelationSet *set, { GPtrArray *array_item; - g_return_if_fail (set != NULL); g_return_if_fail (ATK_IS_RELATION_SET (set)); - g_return_if_fail (relation != NULL); array_item = set->relations; if (array_item == NULL) @@ -150,7 +147,6 @@ void atk_relation_set_add (AtkRelationSet *set, AtkRelation *relation) { - g_return_if_fail (set != NULL); g_return_if_fail (ATK_IS_RELATION_SET (set)); g_return_if_fail (relation != NULL); @@ -173,7 +169,6 @@ atk_relation_set_add (AtkRelationSet *set, gint atk_relation_set_get_n_relations (AtkRelationSet *set) { - g_return_val_if_fail (set != NULL, 0); g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); if (set->relations == NULL) @@ -198,7 +193,6 @@ atk_relation_set_get_relation (AtkRelationSet *set, GPtrArray *array_item; AtkRelation* item; - g_return_val_if_fail (set != NULL, NULL); g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); g_return_val_if_fail (i >= 0, NULL); @@ -229,7 +223,6 @@ atk_relation_set_get_relation_by_type (AtkRelationSet *set, AtkRelation *item; gint i; - g_return_val_if_fail (set != NULL, NULL); g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); array_item = set->relations; diff --git a/atk/atkselection.c b/atk/atkselection.c index 1ca3b39..25bb656 100755 --- a/atk/atkselection.c +++ b/atk/atkselection.c @@ -55,7 +55,6 @@ atk_selection_add_selection (AtkSelection *obj, { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); g_return_val_if_fail (ATK_IS_SELECTION (obj), FALSE); iface = ATK_SELECTION_GET_IFACE (obj); @@ -80,7 +79,6 @@ atk_selection_clear_selection (AtkSelection *obj) { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); g_return_val_if_fail (ATK_IS_SELECTION (obj), FALSE); iface = ATK_SELECTION_GET_IFACE (obj); @@ -113,7 +111,6 @@ atk_selection_ref_selection (AtkSelection *obj, { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, NULL); g_return_val_if_fail (ATK_IS_SELECTION (obj), NULL); iface = ATK_SELECTION_GET_IFACE (obj); @@ -142,7 +139,6 @@ atk_selection_get_selection_count (AtkSelection *obj) { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, 0); g_return_val_if_fail (ATK_IS_SELECTION (obj), 0); iface = ATK_SELECTION_GET_IFACE (obj); @@ -173,7 +169,6 @@ atk_selection_is_child_selected (AtkSelection *obj, { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); g_return_val_if_fail (ATK_IS_SELECTION (obj), FALSE); iface = ATK_SELECTION_GET_IFACE (obj); @@ -200,7 +195,6 @@ atk_selection_remove_selection (AtkSelection *obj, { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); g_return_val_if_fail (ATK_IS_SELECTION (obj), FALSE); iface = ATK_SELECTION_GET_IFACE (obj); @@ -225,7 +219,6 @@ atk_selection_select_all_selection (AtkSelection *obj) { AtkSelectionIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); g_return_val_if_fail (ATK_IS_SELECTION (obj), FALSE); iface = ATK_SELECTION_GET_IFACE (obj); diff --git a/atk/atkstateset.c b/atk/atkstateset.c index 481543d..eba179a 100755 --- a/atk/atkstateset.c +++ b/atk/atkstateset.c @@ -89,7 +89,6 @@ gboolean atk_state_set_is_empty (AtkStateSet *set) { AtkRealStateSet *real_set; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); real_set = (AtkRealStateSet *)set; @@ -115,7 +114,6 @@ atk_state_set_add_state (AtkStateSet *set, AtkStateType type) { AtkRealStateSet *real_set; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); real_set = (AtkRealStateSet *)set; @@ -143,7 +141,6 @@ atk_state_set_add_states (AtkStateSet *set, { AtkRealStateSet *real_set; gint i; - g_return_if_fail (set != NULL); g_return_if_fail (ATK_IS_STATE_SET (set)); real_set = (AtkRealStateSet *)set; @@ -164,7 +161,6 @@ void atk_state_set_clear_states (AtkStateSet *set) { AtkRealStateSet *real_set; - g_return_if_fail (set != NULL); g_return_if_fail (ATK_IS_STATE_SET (set)); real_set = (AtkRealStateSet *)set; @@ -186,7 +182,6 @@ atk_state_set_contains_state (AtkStateSet *set, AtkStateType type) { AtkRealStateSet *real_set; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); real_set = (AtkRealStateSet *)set; @@ -215,7 +210,6 @@ atk_state_set_contains_states (AtkStateSet *set, { AtkRealStateSet *real_set; gint i; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); real_set = (AtkRealStateSet *)set; @@ -242,7 +236,6 @@ atk_state_set_remove_state (AtkStateSet *set, AtkStateType type) { AtkRealStateSet *real_set; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); real_set = (AtkRealStateSet *)set; @@ -274,9 +267,7 @@ atk_state_set_and_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (compare_set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); real_set = (AtkRealStateSet *)set; @@ -309,9 +300,7 @@ atk_state_set_or_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (compare_set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); real_set = (AtkRealStateSet *)set; @@ -345,9 +334,7 @@ atk_state_set_xor_sets (AtkStateSet *set, AtkStateSet *return_set = NULL; AtkState state, state1, state2; - g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - g_return_val_if_fail (compare_set != NULL, FALSE); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), FALSE); real_set = (AtkRealStateSet *)set; diff --git a/atk/atkstreamablecontent.c b/atk/atkstreamablecontent.c index 3d4bca3..de8b429 100755 --- a/atk/atkstreamablecontent.c +++ b/atk/atkstreamablecontent.c @@ -52,7 +52,6 @@ atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable) { AtkStreamableContentIface *iface; - g_return_val_if_fail (streamable != NULL, 0); g_return_val_if_fail (ATK_IS_STREAMABLE_CONTENT (streamable), 0); iface = ATK_STREAMABLE_CONTENT_GET_IFACE (streamable); @@ -80,7 +79,6 @@ atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, { AtkStreamableContentIface *iface; - g_return_val_if_fail (streamable != NULL, NULL); g_return_val_if_fail (i >= 0, NULL); g_return_val_if_fail (ATK_IS_STREAMABLE_CONTENT (streamable), NULL); @@ -108,7 +106,6 @@ atk_streamable_content_get_stream (AtkStreamableContent *streamable, { AtkStreamableContentIface *iface; - g_return_val_if_fail (streamable != NULL, NULL); g_return_val_if_fail (mime_type != NULL, NULL); g_return_val_if_fail (ATK_IS_STREAMABLE_CONTENT (streamable), NULL); diff --git a/atk/atktable.c b/atk/atktable.c index 645106f..b88ce41 100755 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -144,7 +144,6 @@ atk_table_ref_at (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -178,7 +177,6 @@ atk_table_get_index_at (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -210,7 +208,6 @@ atk_table_get_row_at_index (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -242,7 +239,6 @@ atk_table_get_column_at_index (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -271,7 +267,6 @@ atk_table_get_caption (AtkTable *table) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -300,7 +295,6 @@ atk_table_get_n_columns (AtkTable *table) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -331,7 +325,6 @@ atk_table_get_column_description (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -365,7 +358,6 @@ atk_table_get_column_extent_at (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -395,7 +387,6 @@ atk_table_get_column_header (AtkTable *table, gint column) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -424,7 +415,6 @@ atk_table_get_n_rows (AtkTable *table) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -455,7 +445,6 @@ atk_table_get_row_description (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -489,7 +478,6 @@ atk_table_get_row_extent_at (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -519,7 +507,6 @@ atk_table_get_row_header (AtkTable *table, gint row) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -548,7 +535,6 @@ atk_table_get_summary (AtkTable *table) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (ATK_IS_TABLE (table), NULL); iface = ATK_TABLE_GET_IFACE (table); @@ -579,7 +565,6 @@ atk_table_get_selected_rows (AtkTable *table, gint **selected) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -610,7 +595,6 @@ atk_table_get_selected_columns (AtkTable *table, gint **selected) { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, 0); g_return_val_if_fail (ATK_IS_TABLE (table), 0); iface = ATK_TABLE_GET_IFACE (table); @@ -642,7 +626,6 @@ atk_table_is_column_selected (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -674,7 +657,6 @@ atk_table_is_row_selected (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -708,7 +690,6 @@ atk_table_is_selected (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -739,7 +720,6 @@ atk_table_add_row_selection (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -769,7 +749,6 @@ atk_table_remove_row_selection (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -799,7 +778,6 @@ atk_table_add_column_selection (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -829,7 +807,6 @@ atk_table_remove_column_selection (AtkTable *table, { AtkTableIface *iface; - g_return_val_if_fail (table != NULL, FALSE); g_return_val_if_fail (ATK_IS_TABLE (table), FALSE); iface = ATK_TABLE_GET_IFACE (table); @@ -853,7 +830,6 @@ atk_table_set_caption (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); @@ -878,7 +854,6 @@ atk_table_set_column_description (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); @@ -902,7 +877,6 @@ atk_table_set_column_header (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); @@ -927,7 +901,6 @@ atk_table_set_row_description (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); @@ -951,7 +924,6 @@ atk_table_set_row_header (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); @@ -974,7 +946,6 @@ atk_table_set_summary (AtkTable *table, { AtkTableIface *iface; - g_return_if_fail (table != NULL); g_return_if_fail (ATK_IS_TABLE (table)); iface = ATK_TABLE_GET_IFACE (table); diff --git a/atk/atktext.c b/atk/atktext.c index 20072a7..99218be 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -113,7 +113,6 @@ atk_text_get_text (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -139,7 +138,6 @@ atk_text_get_character_at_offset (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, (gunichar) 0); g_return_val_if_fail (ATK_IS_TEXT (text), (gunichar) 0); iface = ATK_TEXT_GET_IFACE (text); @@ -178,7 +176,6 @@ atk_text_get_text_after_offset (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -216,7 +213,6 @@ atk_text_get_text_at_offset (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -255,7 +251,6 @@ atk_text_get_text_before_offset (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -279,7 +274,6 @@ atk_text_get_caret_offset (AtkText *text) { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, -1); g_return_val_if_fail (ATK_IS_TEXT (text), -1); iface = ATK_TEXT_GET_IFACE (text); @@ -314,7 +308,6 @@ atk_text_get_character_extents (AtkText *text, { AtkTextIface *iface; - g_return_if_fail (text != NULL); g_return_if_fail (ATK_IS_TEXT (text)); iface = ATK_TEXT_GET_IFACE (text); @@ -354,7 +347,6 @@ AtkAttributeSet* atk_text_ref_run_attributes (AtkText *tex { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -378,7 +370,6 @@ atk_text_get_character_count (AtkText *text) { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, -1); g_return_val_if_fail (ATK_IS_TEXT (text), -1); iface = ATK_TEXT_GET_IFACE (text); @@ -412,7 +403,6 @@ atk_text_get_offset_at_point (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, -1); g_return_val_if_fail (ATK_IS_TEXT (text), -1); iface = ATK_TEXT_GET_IFACE (text); @@ -437,7 +427,6 @@ atk_text_get_n_selections (AtkText *text) { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, -1); g_return_val_if_fail (ATK_IS_TEXT (text), -1); iface = ATK_TEXT_GET_IFACE (text); @@ -469,7 +458,6 @@ atk_text_get_selection (AtkText *text, gint selection_num, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -499,7 +487,6 @@ atk_text_add_selection (AtkText *text, gint start_offset, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, FALSE); g_return_val_if_fail (ATK_IS_TEXT (text), FALSE); iface = ATK_TEXT_GET_IFACE (text); @@ -528,7 +515,6 @@ atk_text_remove_selection (AtkText *text, gint selection_num) { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, FALSE); g_return_val_if_fail (ATK_IS_TEXT (text), FALSE); iface = ATK_TEXT_GET_IFACE (text); @@ -560,7 +546,6 @@ atk_text_set_selection (AtkText *text, gint selection_num, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, FALSE); g_return_val_if_fail (ATK_IS_TEXT (text), FALSE); iface = ATK_TEXT_GET_IFACE (text); @@ -589,7 +574,6 @@ atk_text_set_caret_offset (AtkText *text, { AtkTextIface *iface; - g_return_val_if_fail (text != NULL, FALSE); g_return_val_if_fail (ATK_IS_TEXT (text), FALSE); iface = ATK_TEXT_GET_IFACE (text); diff --git a/atk/atkvalue.c b/atk/atkvalue.c index 3ed6807..6065346 100755 --- a/atk/atkvalue.c +++ b/atk/atkvalue.c @@ -52,7 +52,6 @@ atk_value_get_current_value (AtkValue *obj, { AtkValueIface *iface; - g_return_if_fail (obj != NULL); g_return_if_fail (value != NULL); g_return_if_fail (ATK_IS_VALUE (obj)); @@ -75,7 +74,6 @@ atk_value_get_maximum_value (AtkValue *obj, { AtkValueIface *iface; - g_return_if_fail (obj != NULL); g_return_if_fail (value != NULL); g_return_if_fail (ATK_IS_VALUE (obj)); @@ -98,7 +96,6 @@ atk_value_get_minimum_value (AtkValue *obj, { AtkValueIface *iface; - g_return_if_fail (obj != NULL); g_return_if_fail (value != NULL); g_return_if_fail (ATK_IS_VALUE (obj)); @@ -123,8 +120,6 @@ atk_value_set_current_value (AtkValue *obj, { AtkValueIface *iface; - g_return_val_if_fail (obj != NULL, FALSE); - g_return_val_if_fail (value != NULL, FALSE); g_return_val_if_fail (ATK_IS_VALUE (obj), FALSE); g_return_val_if_fail (G_IS_VALUE (value), FALSE); -- 2.7.4