Merge pull request #15 from rufferson/master

Small fixes: fall-through, leaks, casts
TelepathyIM · Dec 5, 2020 · 7121dbf · 7121dbf
2 parents cb02444 + 187b196
commit 7121dbf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c
@@ -295,7 +295,7 @@ _channel_io_in (GIOChannel *source, GIOCondition condition, gpointer data)
         break;
       case GIBBER_FD_IO_RESULT_ERROR:
         gibber_transport_emit_error (GIBBER_TRANSPORT(self), error);
-        /* Deliberately falling through */
+        /* Intentional fall-through */
       case GIBBER_FD_IO_RESULT_EOF:
         DEBUG("Failed to read from the transport, closing..");
         _do_disconnect (self);

diff --git a/src/auth-manager.c b/src/auth-manager.c
@@ -274,6 +274,7 @@ gabble_auth_manager_start_auth_cb (GObject *channel,
                   self->priv->server,
                   self->priv->session_id,
                   gabble_auth_manager_start_parent_cb, user_data);
+          wocky_auth_registry_start_data_free (start_data);
           /* we've transferred ownership of the result */
           goto finally;
         }

diff --git a/src/call-stream.c b/src/call-stream.c
@@ -254,7 +254,7 @@ _endpoint_state_changed_cb (
 
   /* We only care about connecting RTP, RTCP is optional */
   state = tp_call_stream_endpoint_get_state (endpoint, 1);
-  wocky_jingle_content_set_transport_state (content, state);
+  wocky_jingle_content_set_transport_state (content, (WockyJingleTransportState) state);
 }
 
 static TpCallStreamEndpoint *

diff --git a/src/gtalk-file-collection.c b/src/gtalk-file-collection.c
@@ -531,7 +531,7 @@ content_new_remote_candidates_cb (WockyJingleContent *content,
           NICE_CANDIDATE_TYPE_RELAYED);
 
 
-      cand->transport = WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP;
+      cand->transport = (NiceCandidateTransport) WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP;
       nice_address_init (&cand->addr);
 
       if (!nice_address_set_from_string (&cand->addr, candidate->address))

diff --git a/src/search-channel.c b/src/search-channel.c
@@ -1245,8 +1245,8 @@ gabble_search_channel_stop (TpSvcChannelTypeContactSearch *self,
 
           change_search_state (chan,
               TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED, &e);
-          /* Deliberately falling through to return from the method: */
         }
+        /* Intentional fall-through */
       case TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED:
       case TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED:
         tp_svc_channel_type_contact_search_return_from_stop (context);

diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
@@ -200,6 +200,7 @@ gabble_server_tls_channel_constructed (GObject *object)
   self->priv->server_cert_path = cert_object_path;
 
   DEBUG ("Server TLS channel constructed at %s", path);
+  g_ptr_array_unref (certificates);
 }
 
 static void

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
@@ -1735,7 +1735,8 @@ gabble_vcard_manager_edit_info_new (const gchar *element_name,
         info->new_alias = g_strdup (element_value);
         element_value = NULL;
 
-        /* deliberate fall-through to check the varargs... */
+        /* Intentional fall-through */
+        /*  to check the varargs... */
       case GABBLE_VCARD_EDIT_DELETE:
       case GABBLE_VCARD_EDIT_CLEAR:
       {