[Telepathy-commits] [telepathy-salut/master] Fix "comparing signed to unsigned" warnings.

Will Thompson will.thompson at collabora.co.uk
Sun Jan 11 08:45:26 PST 2009


Mostly these are using signed ints when iterating GArray, whose len
member is a guint.
---
 lib/gibber/gibber-bytestream-direct.c            |    2 +-
 lib/gibber/gibber-r-multicast-causal-transport.c |    6 +++---
 lib/gibber/gibber-r-multicast-packet.c           |    8 ++++----
 lib/gibber/gibber-r-multicast-sender.c           |    8 ++++----
 lib/gibber/gibber-r-multicast-transport.c        |    4 ++--
 src/salut-avahi-roomlist-manager.c               |    4 ++--
 src/salut-connection.c                           |    8 ++++----
 src/salut-xmpp-connection-manager.c              |    2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c
index d6d7e25..d7710e2 100644
--- a/lib/gibber/gibber-bytestream-direct.c
+++ b/lib/gibber/gibber-bytestream-direct.c
@@ -596,7 +596,7 @@ gibber_bytestream_direct_initiate (GibberBytestreamIface *bytestream)
   } addr;
   GibberBytestreamDirectPrivate *priv =
       GIBBER_BYTESTREAM_DIRECT_GET_PRIVATE (self);
-  int i;
+  guint i;
   gboolean ret;
 
   DEBUG ("Called.");
diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c
index 7436063..3cdb2a8 100644
--- a/lib/gibber/gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/gibber-r-multicast-causal-transport.c
@@ -345,7 +345,7 @@ sendout_packet (GibberRMulticastCausalTransport *transport,
 static gchar *
 g_array_uint32_to_str (GArray *array)
 {
-  int i;
+  guint i;
   GString *str;
 
   if (array == NULL || array->len == 0) {
@@ -687,7 +687,7 @@ handle_session_message (GibberRMulticastCausalTransport *self,
 {
   GibberRMulticastCausalTransportPrivate *priv =
       GIBBER_R_MULTICAST_CAUSAL_TRANSPORT_GET_PRIVATE (self);
-  int i;
+  guint i;
   gboolean outdated = FALSE;
 
   g_assert (packet->type == PACKET_TYPE_SESSION);
@@ -734,7 +734,7 @@ handle_packet_depends (GibberRMulticastCausalTransport *self,
 {
   GibberRMulticastCausalTransportPrivate *priv =
       GIBBER_R_MULTICAST_CAUSAL_TRANSPORT_GET_PRIVATE (self);
-  int i;
+  guint i;
 
   g_assert (GIBBER_R_MULTICAST_PACKET_IS_RELIABLE_PACKET (packet));
 
diff --git a/lib/gibber/gibber-r-multicast-packet.c b/lib/gibber/gibber-r-multicast-packet.c
index 6380dfc..35bc752 100644
--- a/lib/gibber/gibber-r-multicast-packet.c
+++ b/lib/gibber/gibber-r-multicast-packet.c
@@ -434,7 +434,7 @@ get_string (const guint8 *data, gsize length, gsize *offset)
 static void
 add_sender_info (guint8 *data, gsize length, gsize *offset, GArray *senders)
 {
-  int i;
+  guint i;
 
   add_guint8 (data, length, offset, senders->len);
 
@@ -553,7 +553,7 @@ gibber_r_multicast_packet_build (GibberRMulticastPacket *packet)
             packet->data.repair_request.packet_id);
       break;
     case PACKET_TYPE_ATTEMPT_JOIN: {
-      int i;
+      guint i;
       add_guint8 (priv->data, priv->max_data, &(priv->size),
             packet->data.attempt_join.senders->len);
 
@@ -564,7 +564,7 @@ gibber_r_multicast_packet_build (GibberRMulticastPacket *packet)
       break;
     }
     case PACKET_TYPE_JOIN: {
-      int i;
+      guint i;
       add_guint8 (priv->data, priv->max_data, &(priv->size),
             packet->data.join.failures->len);
 
@@ -575,7 +575,7 @@ gibber_r_multicast_packet_build (GibberRMulticastPacket *packet)
       break;
     }
     case PACKET_TYPE_FAILURE: {
-      int i;
+      guint i;
       add_guint8 (priv->data, priv->max_data, &(priv->size),
             packet->data.failure.failures->len);
 
diff --git a/lib/gibber/gibber-r-multicast-sender.c b/lib/gibber/gibber-r-multicast-sender.c
index fc32404..fafce9f 100644
--- a/lib/gibber/gibber-r-multicast-sender.c
+++ b/lib/gibber/gibber-r-multicast-sender.c
@@ -155,7 +155,7 @@ void
 gibber_r_multicast_sender_group_free (GibberRMulticastSenderGroup *group)
 {
   GHashTable *h;
-  int i;
+  guint i;
 
   g_assert (group->popping == FALSE);
 
@@ -239,7 +239,7 @@ static void
 gibber_r_multicast_sender_group_gc_acks (GibberRMulticastSenderGroup *group,
     guint32 sender_id)
 {
-  int i;
+  guint i;
   GibberRMulticastSender *s;
   /* If there are no more senders for sender_id in the list, clean up the acks
    */
@@ -314,7 +314,7 @@ update_sender_acks (gpointer key, gpointer value, gpointer user_data)
 {
   GibberRMulticastSender *sender = GIBBER_R_MULTICAST_SENDER (value);
   GArray *array = (GArray *) user_data;
-  gint i;
+  guint i;
 
   if (sender->state >= GIBBER_R_MULTICAST_SENDER_STATE_STOPPED)
     return;
@@ -475,7 +475,7 @@ gibber_r_multicast_sender_group_push_packet (
 {
   gboolean handled = FALSE;
   GibberRMulticastSender *sender;
-  int i;
+  guint i;
 
   if (packet->type == PACKET_TYPE_WHOIS_REQUEST)
     sender = gibber_r_multicast_sender_group_lookup (group,
diff --git a/lib/gibber/gibber-r-multicast-transport.c b/lib/gibber/gibber-r-multicast-transport.c
index 287dec9..4451609 100644
--- a/lib/gibber/gibber-r-multicast-transport.c
+++ b/lib/gibber/gibber-r-multicast-transport.c
@@ -696,7 +696,7 @@ start_joining_phase (GibberRMulticastTransport *self)
   GibberRMulticastTransportPrivate *priv =
     GIBBER_R_MULTICAST_TRANSPORT_GET_PRIVATE (self);
   GibberRMulticastSender *sender;
-  int i;
+  guint i;
 
   setup_joining_phase (self);
 
@@ -966,7 +966,7 @@ received_foreign_packet_cb (GibberRMulticastCausalTransport *ctransport,
       /* Either the sender wants a start position from us or has replied to one
        * or our AJ messages.. Or it's some completely unrelated packet and we
        * can handle it just like any other reliable packet */
-      int i;
+      guint i;
       gboolean self_in_senders = FALSE;
 
       for (i = 0; i < packet->data.attempt_join.senders->len; i++) {
diff --git a/src/salut-avahi-roomlist-manager.c b/src/salut-avahi-roomlist-manager.c
index 4cc9b83..5fc09b1 100644
--- a/src/salut-avahi-roomlist-manager.c
+++ b/src/salut-avahi-roomlist-manager.c
@@ -75,7 +75,7 @@ static void
 room_resolver_removed (gpointer data)
 {
   GArray *arr = (GArray *) data;
-  int i;
+  guint i;
   for (i = 0; i < arr->len; i++)
     {
       g_object_unref (g_array_index (arr, GObject *, i));
@@ -194,7 +194,7 @@ browser_removed (GaServiceBrowser *browser,
   SalutAvahiRoomlistManagerPrivate *priv =
     SALUT_AVAHI_ROOMLIST_MANAGER_GET_PRIVATE (self);
   GArray *arr;
-  int i;
+  guint i;
 
   arr = g_hash_table_lookup (priv->room_resolvers, name);
 
diff --git a/src/salut-connection.c b/src/salut-connection.c
index 0a0da9e..11308c1 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -1082,7 +1082,7 @@ salut_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface,
 {
   SalutConnection *self = SALUT_CONNECTION (iface);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
-  int i;
+  guint i;
   const gchar **aliases;
   GError *error = NULL;
   TpHandleRepoIface *contact_handles =
@@ -1300,7 +1300,7 @@ static void
 salut_connection_get_avatar_tokens (TpSvcConnectionInterfaceAvatars *iface,
     const GArray *contacts, DBusGMethodInvocation *context)
 {
-  int i;
+  guint i;
   gchar **ret;
   GError *err = NULL;
   SalutConnection *self = SALUT_CONNECTION (iface);
@@ -1356,7 +1356,7 @@ salut_connection_get_known_avatar_tokens (
     TpSvcConnectionInterfaceAvatars *iface, const GArray *contacts,
     DBusGMethodInvocation *context)
 {
-  int i;
+  guint i;
   GHashTable *ret;
   GError *err = NULL;
   SalutConnection *self = SALUT_CONNECTION (iface);
@@ -1485,7 +1485,7 @@ salut_connection_request_avatars (
     const GArray *contacts,
     DBusGMethodInvocation *context)
 {
-  gint i;
+  guint i;
   GError *err = NULL;
   SalutConnection *self = SALUT_CONNECTION (iface);
   SalutConnectionPrivate *priv = SALUT_CONNECTION_GET_PRIVATE (self);
diff --git a/src/salut-xmpp-connection-manager.c b/src/salut-xmpp-connection-manager.c
index 9c857c9..2d09f91 100644
--- a/src/salut-xmpp-connection-manager.c
+++ b/src/salut-xmpp-connection-manager.c
@@ -1291,7 +1291,7 @@ create_new_outgoing_connection (SalutXmppConnectionManager *self,
   GibberXmppConnection *connection;
   GibberLLTransport *transport;
   GArray *addrs;
-  gint i;
+  guint i;
   GError *e = NULL;
 
   DEBUG ("create a new outgoing connection to %s", contact->name);
-- 
1.5.6.5




More information about the Telepathy-commits mailing list