[Telepathy-commits] [telepathy-salut/master] use assertions instead of gibber_goto_if_fail and gibber_goto_if_reached

[Guillaume Desmottes]

---
 lib/gibber/gibber-xmpp-stanza.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/gibber/gibber-xmpp-stanza.c b/lib/gibber/gibber-xmpp-stanza.c
index ba839d1..6e9d8fc 100644
--- a/lib/gibber/gibber-xmpp-stanza.c
+++ b/lib/gibber/gibber-xmpp-stanza.c
@@ -188,8 +188,8 @@ gibber_xmpp_stanza_add_build_va (GibberXmppNode *node,
             gchar *key = va_arg (ap, gchar *);
             gchar *value = va_arg (ap, gchar *);
 
-            gibber_goto_if_fail (key != NULL, error_build_parsing);
-            gibber_goto_if_fail (value != NULL, error_build_parsing);
+            g_assert (key != NULL);
+            g_assert (value != NULL);
             gibber_xmpp_node_set_attribute (stack->data, key, value);
           }
           break;
@@ -199,7 +199,7 @@ gibber_xmpp_stanza_add_build_va (GibberXmppNode *node,
             gchar *name = va_arg (ap, gchar *);
             GibberXmppNode *child;
 
-            gibber_goto_if_fail (name != NULL, error_build_parsing);
+            g_assert (name != NULL);
             child = gibber_xmpp_node_add_child (stack->data, name);
             stack = g_slist_prepend (stack, child);
           }
@@ -209,7 +209,7 @@ gibber_xmpp_stanza_add_build_va (GibberXmppNode *node,
           {
             gchar *txt = va_arg (ap, gchar *);
 
-            gibber_goto_if_fail (txt != NULL, error_build_parsing);
+            g_assert (txt != NULL);
             gibber_xmpp_node_set_content (stack->data, txt);
           }
           break;
@@ -218,7 +218,7 @@ gibber_xmpp_stanza_add_build_va (GibberXmppNode *node,
           {
             gchar *ns = va_arg (ap, gchar *);
 
-            gibber_goto_if_fail (ns != NULL, error_build_parsing);
+            g_assert (ns != NULL);
             gibber_xmpp_node_set_ns (stack->data, ns);
           }
           break;
@@ -234,13 +234,13 @@ gibber_xmpp_stanza_add_build_va (GibberXmppNode *node,
           {
             GibberXmppNode **dest = va_arg (ap, GibberXmppNode **);
 
-            gibber_goto_if_fail (dest != NULL, error_build_parsing);
+            g_assert (dest != NULL);
             *dest = stack->data;
           }
           break;
 
         default:
-          gibber_goto_if_reached (error_build_parsing);
+          g_assert_not_reached ();
         }
 
       arg = va_arg (ap, GibberBuildTag);
-- 
1.5.6.5