fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 08:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compiler warnings when X11 autolaunch and launchd are both disabled

Browse source 
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>
This commit is contained in:
Simon McVittie 2013-05-08 15:26:14 +01:00
parent eabf6c42a1
commit 863c989bb6
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbus/dbus-sysdeps-unix.c
View file

@ -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.

3
tools/dbus-launch.c
View file

@ -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 */