diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-04 08:19:59 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-17 16:52:51 +0100 |
| commit | 92c39d1d8a30110c5760bd8d5e695e26a8538d1a (patch) | |
| tree | 5950f5a8b1e7c42df8a173ccc2fbcb7a77ce0983 | |
| parent | 40a6b6e815d9762221ac0c6e6bd11a53fde4b11b (diff) | |
Fix of 'warning: variable ‘..‘ set but not used [-Wunused-but-set-variable]'.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89284
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | test/test-service.c | 8 | ||||
| -rw-r--r-- | tools/dbus-launch-win.c | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/test/test-service.c b/test/test-service.c index 7181fa38..c0bd2c60 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -400,20 +400,18 @@ main (int argc, int result; DBusConnection *connection; const char *name; - dbus_bool_t do_fork; - +#ifndef DBUS_WIN + dbus_bool_t do_fork = FALSE; +#endif if (argc != 3) { name = "org.freedesktop.DBus.TestSuiteEchoService"; - do_fork = FALSE; } else { name = argv[1]; #ifndef DBUS_WIN do_fork = strcmp (argv[2], "fork") == 0; -#else - do_fork = FALSE; #endif } diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c index d899010a..1dfd0954 100644 --- a/tools/dbus-launch-win.c +++ b/tools/dbus-launch-win.c @@ -89,7 +89,7 @@ main (int argc, char **argv) wchar_t *p; wchar_t *daemon_name; int result; - int showConsole = 0; + #ifdef DBUS_WINCE char *s = NULL; #else @@ -102,10 +102,6 @@ main (int argc, char **argv) BOOL inherit = TRUE; DWORD flags = 0; -#ifdef AUTO_ACTIVATE_CONSOLE_WHEN_VERBOSE_MODE - if (verbose) - showConsole = 1; -#endif GetModuleFileNameW (NULL, dbusDaemonPath, DIM (dbusDaemonPath)); daemon_name = WCSTRINGIFY(DBUS_DAEMON_NAME) L".exe"; |