From 7da78d6601e738d5839e9ef85b9c8b7ac0ccad15 Mon Sep 17 00:00:00 2001
From: "Ruslan N. Marchenko" <me@ruff.mobi>
Date: Thu, 26 Mar 2020 11:30:10 +0100
Subject: Minor fixes in syntax and code

 * Localize variables in wocky-connector.c and wocky-jabber-auth.c
 * Add fallthrough marker to wocky-jingle-session.c
 * remove double const in wocky-data-form.c
 * fix pointer dereference in wocky-sasl-digest-md5.c
---
 wocky/wocky-connector.c       |  5 +++--
 wocky/wocky-data-form.c       | 10 +++++-----
 wocky/wocky-jabber-auth.c     |  5 +++--
 wocky/wocky-jingle-session.c  |  1 +
 wocky/wocky-sasl-digest-md5.c |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c
index f3bb3c8..f821ad9 100644
--- a/wocky/wocky-connector.c
+++ b/wocky/wocky-connector.c
@@ -1972,7 +1972,6 @@ iq_bind_resource_recv_cb (GObject *source,
 
   switch (sub)
     {
-      WockyNode *node = NULL;
       WockyConnectorError code;
 
       case WOCKY_STANZA_SUB_TYPE_ERROR:
@@ -1999,7 +1998,8 @@ iq_bind_resource_recv_cb (GObject *source,
         break;
 
       case WOCKY_STANZA_SUB_TYPE_RESULT:
-        node = wocky_node_get_child (
+        {
+        WockyNode *node = wocky_node_get_child (
           wocky_stanza_get_top_node (reply), "bind");
         if (node != NULL)
           node = wocky_node_get_child (node, "jid");
@@ -2013,6 +2013,7 @@ iq_bind_resource_recv_cb (GObject *source,
 
         priv->state = WCON_XMPP_BOUND;
         establish_session (self);
+        }
         break;
 
       default:
diff --git a/wocky/wocky-data-form.c b/wocky/wocky-data-form.c
index c74c1ae..fc4265e 100644
--- a/wocky/wocky-data-form.c
+++ b/wocky/wocky-data-form.c
@@ -388,7 +388,7 @@ get_field_value (
 
           if (ret != NULL)
             {
-              const gchar const *value_str[] = { value, NULL };
+              const gchar *value_str[] = { value, NULL };
 
               if (raw_value_contents != NULL)
                 *raw_value_contents = g_strdupv ((GStrv) value_str);
@@ -405,7 +405,7 @@ get_field_value (
       case WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE:
       case WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE:
         {
-          const gchar const *value_str[] = { value, NULL };
+          const gchar *value_str[] = { value, NULL };
 
           if (raw_value_contents != NULL)
             *raw_value_contents = g_strdupv ((GStrv) value_str);
@@ -652,7 +652,7 @@ wocky_data_form_set_type (WockyDataForm *self,
     const gchar *form_type)
 {
   WockyDataFormField *field;
-  const gchar const *raw_value_contents[] =
+  const gchar *raw_value_contents[] =
       { form_type, NULL };
 
   g_return_val_if_fail (form_type != NULL, FALSE);
@@ -728,14 +728,14 @@ data_form_set_value (WockyDataForm *self,
   t = G_VALUE_TYPE (field->value);
   if (t == G_TYPE_STRING)
     {
-      const gchar const *value_str[] =
+      const gchar *value_str[] =
           { g_value_get_string (field->value), NULL };
 
       field->raw_value_contents = g_strdupv ((GStrv) value_str);
     }
   else if (t == G_TYPE_BOOLEAN)
     {
-      const gchar const *value_str[] =
+      const gchar *value_str[] =
           { g_value_get_boolean (field->value) ? "1" : "0", NULL };
 
       field->raw_value_contents = g_strdupv ((GStrv) value_str);
diff --git a/wocky/wocky-jabber-auth.c b/wocky/wocky-jabber-auth.c
index 3879872..18c033f 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -540,7 +540,6 @@ jabber_auth_fields (GObject *source,
 
   switch (sub)
     {
-      WockyNode *node = NULL;
       WockyAuthError code;
 
       case WOCKY_STANZA_SUB_TYPE_ERROR:
@@ -558,7 +557,8 @@ jabber_auth_fields (GObject *source,
         break;
 
       case WOCKY_STANZA_SUB_TYPE_RESULT:
-        node = wocky_stanza_get_top_node (fields);
+        {
+        WockyNode *node = wocky_stanza_get_top_node (fields);
         node = wocky_node_get_child_ns (node, "query",
             WOCKY_JABBER_NS_AUTH);
         if ((node != NULL) &&
@@ -580,6 +580,7 @@ jabber_auth_fields (GObject *source,
 
             g_slist_free (mechanisms);
           }
+        }
         break;
 
       default:
diff --git a/wocky/wocky-jingle-session.c b/wocky/wocky-jingle-session.c
index 321b221..7ac044e 100644
--- a/wocky/wocky-jingle-session.c
+++ b/wocky/wocky-jingle-session.c
@@ -169,6 +169,7 @@ wocky_jingle_session_defines_action (WockyJingleSession *sess,
         if (a == WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT ||
             a == WOCKY_JINGLE_ACTION_INFO )
           return TRUE;
+      /* fall through */
       case WOCKY_JINGLE_DIALECT_GTALK3:
         return (a == WOCKY_JINGLE_ACTION_SESSION_ACCEPT ||
             a == WOCKY_JINGLE_ACTION_SESSION_INITIATE ||
diff --git a/wocky/wocky-sasl-digest-md5.c b/wocky/wocky-sasl-digest-md5.c
index d7b5caf..eb79b55 100644
--- a/wocky/wocky-sasl-digest-md5.c
+++ b/wocky/wocky-sasl-digest-md5.c
@@ -322,7 +322,7 @@ md5_prepare_response (WockySaslDigestMd5Private *priv, GHashTable *challenge,
   DEBUG ("Got username and password");
 
   nonce = g_hash_table_lookup (challenge, "nonce");
-  if (nonce == NULL || nonce == '\0')
+  if (nonce == NULL || *nonce == '\0')
     {
       g_set_error (error, WOCKY_AUTH_ERROR,
           WOCKY_AUTH_ERROR_INVALID_REPLY,
-- 
cgit v1.2.3