diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-14 18:46:38 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-05 12:27:04 +0100 |
| commit | 222b7d9f9794308d2175c3abb40f414e82eaa9f3 (patch) | |
| tree | 379c325a6a8e641585eb23f47f3d59dcabde3dd2 /bus/config-parser.c | |
| parent | b4e01ab099df34368413ea0f6be86e0f14b99155 (diff) | |
| download | dbus-222b7d9f9794308d2175c3abb40f414e82eaa9f3.tar.gz | |
config-parser: don't try to get CommonProgramFiles from the environment on Unix
It's unused on Unix, and gcc warns.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to 'bus/config-parser.c')
| -rw-r--r-- | bus/config-parser.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index f9432555..c636707f 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3271,11 +3271,12 @@ test_default_session_servicedirs (void) DBusList *dirs; DBusList *link; DBusString progs; - const char *common_progs; int i; #ifdef DBUS_WIN + const char *common_progs; char buffer[1024]; + if (_dbus_get_install_root(buffer, sizeof(buffer))) { strcat(buffer,DBUS_DATADIR); @@ -3289,8 +3290,9 @@ test_default_session_servicedirs (void) if (!_dbus_string_init (&progs)) _dbus_assert_not_reached ("OOM allocating progs"); - common_progs = _dbus_getenv ("CommonProgramFiles"); #ifndef DBUS_UNIX + common_progs = _dbus_getenv ("CommonProgramFiles"); + if (common_progs) { if (!_dbus_string_append (&progs, common_progs)) @@ -3411,7 +3413,9 @@ test_default_system_servicedirs (void) DBusList *dirs; DBusList *link; DBusString progs; +#ifndef DBUS_UNIX const char *common_progs; +#endif int i; /* On Unix we don't actually use this variable, but it's easier to handle the @@ -3419,8 +3423,9 @@ test_default_system_servicedirs (void) if (!_dbus_string_init (&progs)) _dbus_assert_not_reached ("OOM allocating progs"); - common_progs = _dbus_getenv ("CommonProgramFiles"); #ifndef DBUS_UNIX + common_progs = _dbus_getenv ("CommonProgramFiles"); + if (common_progs) { if (!_dbus_string_append (&progs, common_progs)) |