diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-09-24 09:40:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-12 20:13:18 +0200 |
| commit | 2e8a2921e5ae7bb12dbed9e94311203292ddc9a9 (patch) | |
| tree | be93447436fc2d29a03c94d4300e4b9f2f0120d5 /src | |
| parent | cf26bb2dea1476fede90725cd19f105a37e437e5 (diff) | |
| download | NetworkManager-2e8a2921e5ae7bb12dbed9e94311203292ddc9a9.tar.gz | |
core: ensure properly comparing boolean values in connection_sort()
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings/nm-settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 096608ce05..5a7bf4159e 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -326,17 +326,17 @@ connection_sort (gconstpointer pa, gconstpointer pb) NMConnection *b = NM_CONNECTION (pb); NMSettingConnection *con_b; guint64 ts_a = 0, ts_b = 0; + gboolean can_ac_a, can_ac_b; con_a = nm_connection_get_setting_connection (a); g_assert (con_a); con_b = nm_connection_get_setting_connection (b); g_assert (con_b); - if (nm_setting_connection_get_autoconnect (con_a) != nm_setting_connection_get_autoconnect (con_b)) { - if (nm_setting_connection_get_autoconnect (con_a)) - return -1; - return 1; - } + can_ac_a = !!nm_setting_connection_get_autoconnect (con_a); + can_ac_b = !!nm_setting_connection_get_autoconnect (con_b); + if (can_ac_a != can_ac_b) + return can_ac_a ? -1 : 1; nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pa), &ts_a); nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pb), &ts_b); |