Trivial -Wsign-compare fixes.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=17289
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/bus/signals.c b/bus/signals.c
index 260dd2432324f1908a14eb78cc5bc368a61d07d9..e8def9f76f08db8a2d469e492b241e0bf3044bfe 100644 (file)
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -848,7 +848,8 @@ bus_match_rule_parse_arg_match (BusMatchRule     *rule,
 
   if (end != length)
     {
-      if ((end + strlen ("path")) == length &&
+      int len1 = strlen ("path");
+      if ((end + len1) == length &&
           _dbus_string_ends_with_c_str (&key_str, "path"))
         {
           is_path = TRUE;

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 01c2367cb22b5b36b49bfc52fcd315c55603ca6c..22da695bf55f8d19da3b44878a80bfb816e77ca8 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -602,7 +602,7 @@ static void
 close_unix_fds(int *fds, unsigned *n_fds)
 {
   DBusError e;
-  int i;
+  unsigned int i;
 
   if (*n_fds <= 0)
     return;

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index 4a2a9c84479fa26a1dfedc728c4ca82e2f1600cd..bd0817c0691bc632a6173d0bd459dd661dbc5847 100644 (file)
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -68,7 +68,7 @@ indent (int depth)
 
 static void
 print_hex (const unsigned char *bytes,
-           int len,
+           unsigned int len,
            int depth)
 {
   unsigned int i, columns;

diff --git a/tools/dbus-spam.c b/tools/dbus-spam.c
index ce918754fb4a2cb1c6553dd5c5675c341a842aaf..e708ea2d25b9afc30797779e68350083be5be04a 100644 (file)
--- a/tools/dbus-spam.c
+++ b/tools/dbus-spam.c
@@ -155,9 +155,9 @@ dbus_test_tool_spam (int argc, char **argv)
   int i;
   int count = 1;
   int sent = 0;
-  int sent_in_this_conn = 0;
+  unsigned int sent_in_this_conn = 0;
   int received = 0;
-  int received_before_this_conn = 0;
+  unsigned int received_before_this_conn = 0;
   int queue_len = 1;
   const char *payload = NULL;
   char *payload_buf = NULL;