From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 12 Mar 2015 19:03:12 +0000 (+0000)
Subject: Fix assorted compiler warnings on Windows.
X-Git-Tag: dbus-1.9.16~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7647179096426e4dc76332696eea926ea3def41a;p=thirdparty%2Fdbus.git

Fix assorted compiler warnings on Windows.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
[rh: rebased because a few hunks have already been applied with commit
 92c39d1d8a30110c5760bd8d5e695e26a8538d1a]
---

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 62c4eb581..feeaec5ef 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -1332,7 +1332,9 @@ check_get_connection_unix_process_id (BusContext     *context,
   dbus_bool_t retval;
   DBusError error;
   const char *base_service_name;
+#ifdef DBUS_UNIX
   dbus_uint32_t pid;
+#endif
 
   retval = FALSE;
   dbus_error_init (&error);
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index 5266b013f..0c0ab7ccb 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -1045,8 +1045,10 @@ verify_test_message_memleak (DBusMessage *message)
   int our_string_array_len1;
   char **our_string_array2;
   int our_string_array_len2;
+#ifdef HAVE_UNIX_FD_PASSING
   int our_unix_fd1;
   int our_unix_fd2;
+#endif
   DBusInitialFDs *initial_fds;
 
   initial_fds = _dbus_check_fdleaks_enter ();
diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index bda228373..e83c53972 100644
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -380,7 +380,6 @@ _dbus_stat(const DBusString *filename,
   const char *filename_c;
   WIN32_FILE_ATTRIBUTE_DATA wfad;
   char *lastdot;
-  DWORD rc;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
diff --git a/test/manual-paths.c b/test/manual-paths.c
index 4ce3ffc74..e392c5c3c 100644
--- a/test/manual-paths.c
+++ b/test/manual-paths.c
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-dbus_bool_t print_install_root()
+static dbus_bool_t print_install_root()
 {
   char runtime_prefix[1000];
 
@@ -25,7 +25,7 @@ dbus_bool_t print_install_root()
   return TRUE;
 }
 
-dbus_bool_t print_service_dirs()
+static dbus_bool_t print_service_dirs()
 {
   DBusList *dirs;
   DBusList *link;
@@ -44,7 +44,7 @@ dbus_bool_t print_service_dirs()
   return TRUE;
 }
 
-dbus_bool_t print_replace_install_prefix(const char *s)
+static dbus_bool_t print_replace_install_prefix(const char *s)
 {
   const char *s2 = _dbus_replace_install_prefix(s);
   if (!s2)
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index 1891da77a..80c969861 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -155,10 +155,10 @@ print_ay (DBusMessageIter *iter, int depth)
     }
 }
 
+#ifdef DBUS_UNIX
 static void
 print_fd (int fd, int depth)
 {
-#ifdef DBUS_UNIX
   int ret;
   struct stat statbuf = {0,};
   union {
@@ -172,7 +172,6 @@ print_fd (int fd, int depth)
   int addrlen = sizeof (addr);
   int peerlen = sizeof (peer);
   int has_peer;
-#endif
 
   /* Don't print the fd number: it is different in every process and since
    * dbus-monitor closes the fd after reading it, the same number would be
@@ -182,7 +181,6 @@ print_fd (int fd, int depth)
   if (fd == -1)
     return;
 
-#ifdef DBUS_UNIX
   ret = fstat (fd, &statbuf);
   if (ret == -1)
     return;
@@ -297,8 +295,8 @@ print_fd (int fd, int depth)
         printf ("unknown (%d)\n", addr.sa.sa_family);
         break;
     }
-#endif
 }
+#endif
 
 static void
 print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)