diff options
| author | Simon McVittie <smcv@collabora.com> | 2021-02-02 10:25:40 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2021-02-02 10:25:40 +0000 |
| commit | 7c0b9c776f6280eb5139017043877358a6ad9d7b (patch) | |
| tree | eee904829f7879c6aa3adca68dff0671a451b2ce | |
| parent | 6cca2565269ca361f2545dc1c271635cd5212a6c (diff) | |
| download | glib-7c0b9c776f6280eb5139017043877358a6ad9d7b.tar.gz | |
gdbus: Improve readability by avoiding ternary operator
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | gio/gdbusaddress.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c index d26c4d25f..6d519a3f4 100644 --- a/gio/gdbusaddress.c +++ b/gio/gdbusaddress.c @@ -1330,7 +1330,11 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type, switch (bus_type) { case G_BUS_TYPE_SYSTEM: - ret = !is_setuid ? g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS")) : NULL; + if (is_setuid) + ret = NULL; + else + ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS")); + if (ret == NULL) { ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket"); @@ -1338,7 +1342,11 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type, break; case G_BUS_TYPE_SESSION: - ret = !is_setuid ? g_strdup (g_getenv ("DBUS_SESSION_BUS_ADDRESS")) : NULL; + if (is_setuid) + ret = NULL; + else + ret = g_strdup (g_getenv ("DBUS_SESSION_BUS_ADDRESS")); + if (ret == NULL) { ret = get_session_address_platform_specific (&local_error); |