diff options
author | Thomas Haller <thaller@redhat.com> | 2017-03-16 14:01:26 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-03-16 14:01:26 +0100 |
commit | cd2fea10f5604d1c93101d78abe5795953f7c5bb (patch) | |
tree | 562211c949516a40c61ba7d87238c2374055b3ce | |
parent | b92d56ad90e90fd0d9302dc029c1a9c18cfeed04 (diff) | |
download | NetworkManager-th/default-route-resync.tar.gz |
default-route-manager: use nm_cmp_uint32_p_with_data() instead of reimplementationth/default-route-resync
-rw-r--r-- | src/nm-default-route-manager.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index 50a6fac9f3..8e849f72de 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -480,17 +480,6 @@ _get_assumed_interface_metrics (const VTableIP *vtable, NMDefaultRouteManager *s return result; } -static int -_sort_metrics_ascending_fcn (gconstpointer a, gconstpointer b) -{ - guint32 m_a = *((guint32 *) a); - guint32 m_b = *((guint32 *) b); - - if (m_a < m_b) - return -1; - return m_a == m_b ? 0 : 1; -} - static gboolean _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *changed_entry, const Entry *old_entry, gboolean external_change) { @@ -622,7 +611,7 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c g_array_free (routes, TRUE); - g_array_sort (changed_metrics, _sort_metrics_ascending_fcn); + g_array_sort_with_data (changed_metrics, nm_cmp_uint32_p_with_data, NULL); last_metric = -1; for (j = 0; j < changed_metrics->len; j++) { expected_metric = g_array_index (changed_metrics, guint32, j); |