From f8d2ef4aca7d74788b9c03272e9bb536254a8ac6 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 19 Dec 2008 18:54:59 -0500
Subject: Various compiler warning fixes

---
 dbus/dbus-marshal-basic.c     | 2 +-
 dbus/dbus-spawn.c             | 4 ++--
 dbus/dbus-sysdeps-unix.c      | 2 +-
 dbus/dbus-sysdeps-util-unix.c | 1 +
 dbus/dbus-sysdeps.c           | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'dbus')

diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index 0a33ff15..724d94b8 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -1333,7 +1333,7 @@ _dbus_verbose_bytes (const unsigned char *data,
 
   if (aligned != data)
     {
-      _dbus_verbose ("%4d\t%p: ", - (data - aligned), aligned);
+      _dbus_verbose ("%4ld\t%p: ", - (long)(data - aligned), aligned);
       while (aligned != data)
         {
           _dbus_verbose ("    ");
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 35ccba6c..f4e3b587 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -36,6 +36,8 @@
 #include <errno.h>
 #endif
 
+extern char **environ;
+
 /**
  * @addtogroup DBusInternalsUtils
  * @{
@@ -914,8 +916,6 @@ do_exec (int                       child_err_report_fd,
 
   if (envp == NULL)
     {
-      extern char **environ;
-
       _dbus_assert (environ != NULL);
 
       envp = environ;
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 01516a1b..29d234a4 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -758,7 +758,7 @@ _dbus_connect_tcp_socket (const char     *host,
                           const char     *family,
                           DBusError      *error)
 {
-  int saved_errno;
+  int saved_errno = 0;
   int fd = -1, res;
   struct addrinfo hints;
   struct addrinfo *ai, *tmp;
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 7f7b265d..03928044 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -43,6 +43,7 @@
 #include <sys/socket.h>
 #include <dirent.h>
 #include <sys/un.h>
+#include <syslog.h>
 #ifdef HAVE_LIBAUDIT
 #include <sys/prctl.h>
 #include <sys/capability.h>
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index d740f875..00a1a3de 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -51,6 +51,8 @@ _DBUS_DEFINE_GLOBAL_LOCK (win_fds);
 _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
 _DBUS_DEFINE_GLOBAL_LOCK (system_users);
 
+extern char **environ;
+
 /**
  * @defgroup DBusSysdeps Internal system-dependent API
  * @ingroup DBusInternals
@@ -191,7 +193,6 @@ _dbus_clearenv (void)
   if (clearenv () != 0)
      rc = FALSE;
 #else
-  extern char **environ;
 
   if (environ != NULL)
     environ[0] = NULL;
@@ -210,7 +211,6 @@ char **
 _dbus_get_environment (void)
 {
   int i, length;
-  extern char **environ;
   char **environment;
 
   _dbus_assert (environ != NULL);
-- 
cgit