fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 18:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: don't rely on g_steal_pointer() returning a void pointer

Browse source 
Next, we will update g_steal_pointer() to cast the return type
to the type of the argument. Hence, this automatic conversion
from setting (sub) classes to NMSetting no longer works.

Add an explict cast.
This commit is contained in:
Thomas Haller 2019-02-20 14:39:57 +01:00
parent 787a18c467
commit a13b2397de
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1425,8 +1425,8 @@ make_user_setting (shvarFile *ifcfg)
has_user_data = TRUE;
}
return has_user_data
? g_steal_pointer (&s_user)
return has_user_data
? NM_SETTING (g_steal_pointer (&s_user))
: NULL;
}
@ -1611,7 +1611,7 @@ make_ip4_setting (shvarFile *ifcfg,
NULL);
if (nm_streq (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED))
return g_steal_pointer (&s_ip4);
return NM_SETTING (g_steal_pointer (&s_ip4));
/* Handle DHCP settings */
nm_clear_g_free (&value);
@ -1802,7 +1802,7 @@ make_ip4_setting (shvarFile *ifcfg,
}
g_object_set (s_ip4, NM_SETTING_IP_CONFIG_DAD_TIMEOUT, (int) timeout, NULL);
return g_steal_pointer (&s_ip4);
return NM_SETTING (g_steal_pointer (&s_ip4));
}
static void
@ -2944,7 +2944,7 @@ make_wep_setting (shvarFile *ifcfg,
return NULL;
}
return g_steal_pointer (&s_wsec);
return NM_SETTING (g_steal_pointer (&s_wsec));
}
static gboolean
@ -5386,7 +5386,7 @@ make_vlan_setting (shvarFile *ifcfg,
parse_prio_map_list (s_vlan, ifcfg, "VLAN_INGRESS_PRIORITY_MAP", NM_VLAN_INGRESS_MAP);
parse_prio_map_list (s_vlan, ifcfg, "VLAN_EGRESS_PRIORITY_MAP", NM_VLAN_EGRESS_MAP);
return g_steal_pointer (&s_vlan);
return NM_SETTING (g_steal_pointer (&s_vlan));
}
static NMConnection *