diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-02 15:47:37 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-18 11:45:36 +0100 |
| commit | 8a46b25cfa8c33daa8af37bb8103ca02286001b1 (patch) | |
| tree | 1725f84d8c42af42d1153aeaa71e63be8854bc93 /src/platform/nm-platform.c | |
| parent | 1443bf77e8cefc6f2d49f1e7f4140155ad73551b (diff) | |
| download | NetworkManager-lr/glib-2-40.tar.gz | |
all: require glib 2.40lr/glib-2-40
RHEL 7.1 and Ubuntu 14.04 LTS both have this.
https://bugzilla.gnome.org/show_bug.cgi?id=792323
Diffstat (limited to 'src/platform/nm-platform.c')
| -rw-r--r-- | src/platform/nm-platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index d2c0be2851..399de4a743 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -601,7 +601,7 @@ nm_platform_link_get_all (NMPlatform *self, gboolean sort_by_name) for (i = 0; i < links->len; i++) { item = NMP_OBJECT_CAST_LINK (links->pdata[i]); nm_assert (item->ifindex > 0); - if (!nm_g_hash_table_insert (unseen, GINT_TO_POINTER (item->ifindex), NULL)) + if (!g_hash_table_insert (unseen, GINT_TO_POINTER (item->ifindex), NULL)) nm_assert_not_reached (); } @@ -3338,7 +3338,7 @@ nm_platform_ip4_address_sync (NMPlatform *self, known_addresses_idx = g_hash_table_new ((GHashFunc) nmp_object_id_hash, (GEqualFunc) nmp_object_id_equal); } - if (!nm_g_hash_table_insert (known_addresses_idx, (gpointer) o, (gpointer) o)) { + if (!g_hash_table_insert (known_addresses_idx, (gpointer) o, (gpointer) o)) { /* duplicate? Keep only the first instance. */ goto delete_and_next; } @@ -3750,7 +3750,7 @@ nm_platform_ip_route_sync (NMPlatform *self, routes_idx = g_hash_table_new ((GHashFunc) nmp_object_id_hash, (GEqualFunc) nmp_object_id_equal); } - if (!nm_g_hash_table_insert (routes_idx, (gpointer) conf_o, (gpointer) conf_o)) { + if (!g_hash_table_insert (routes_idx, (gpointer) conf_o, (gpointer) conf_o)) { _LOGD ("route-sync: skip adding duplicate route %s", nmp_object_to_string (conf_o, NMP_OBJECT_TO_STRING_PUBLIC, sbuf1, sizeof (sbuf1))); continue; |