diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-08 15:26:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-10 11:34:42 +0100 |
| commit | 863c989bb631d7063597db30fe8add3233cca7fd (patch) | |
| tree | d8ed4a498b179f728c2303ad3868f623eba458a5 | |
| parent | eabf6c42a1b779f57f2c08d35772035788657579 (diff) | |
| download | dbus-863c989bb631d7063597db30fe8add3233cca7fd.tar.gz | |
Fix compiler warnings when X11 autolaunch and launchd are both disabled
From the department of "if it isn't tested, it doesn't work". I tried
compiling dbus without an assortment of optional features:
in_builddir ~/build/dbus/legacy ${MR_REPO}/configure \
--enable-developer --enable-maintainer-mode --enable-tests \
dbus_cv_sync_sub_and_fetch=no \
--disable-selinux \
--disable-inotify \
--disable-dnotify \
--disable-epoll \
--disable-kqueue \
--disable-launchd \
--disable-systemd \
--disable-libaudit \
--without-valgrind \
--disable-x11-autolaunch \
&& ...
and it resulted in -Wunused warnings.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64362
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Thiago Macieira <thiago@kde.org>
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 2 | ||||
| -rw-r--r-- | tools/dbus-launch.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 34dfbe7d..d3dd6001 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -3220,6 +3220,7 @@ _dbus_get_tmpdir(void) return tmpdir; } +#if defined(DBUS_ENABLE_X11_AUTOLAUNCH) || defined(DBUS_ENABLE_LAUNCHD) /** * Execute a subprocess, returning up to 1024 bytes of output * into @p result. @@ -3421,6 +3422,7 @@ _read_subprocess_line_argv (const char *progpath, return retval; } +#endif /** * Returns the address of a new session bus. diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 2a9dabfa..b2ffe41d 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -1162,7 +1162,6 @@ main (int argc, char **argv) char *end; long wid = 0; long val; - int ret2; verbose ("=== Parent dbus-launch continues\n"); @@ -1236,6 +1235,8 @@ main (int argc, char **argv) #ifdef DBUS_ENABLE_X11_AUTOLAUNCH if (xdisplay != NULL) { + int ret2; + verbose("Saving x11 address\n"); ret2 = x11_save_address (bus_address, bus_pid, &wid); /* Only get an existing dbus session when autolaunching */ |