colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default-route-manager: use nm_cmp_uint32_p_with_data() instead of reimplementation

Browse Source
This commit is contained in:
Thomas Haller
2017-03-16 14:01:26 +01:00
parent e181956fdd
commit 0057dc332e
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nm-default-route-manager.c
View File

@@ -480,17 +480,6 @@ _get_assumed_interface_metrics (const VTableIP *vtable, NMDefaultRouteManager *s
return result; 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 static gboolean
_resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *changed_entry, const Entry *old_entry, gboolean external_change) _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *changed_entry, const Entry *old_entry, gboolean external_change)
{ {
@@ -621,7 +610,7 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c
g_array_free (routes, TRUE); 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; last_metric = -1;
for (j = 0; j < changed_metrics->len; j++) { for (j = 0; j < changed_metrics->len; j++) {
expected_metric = g_array_index (changed_metrics, guint32, j); expected_metric = g_array_index (changed_metrics, guint32, j);