fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 00:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: fix indention and assertion in apply_mtu_from_config()

Browse source 
For the assertion use nm_streq0(). If we bother checking for invalid
values (that are supposed to never happen), avoid a possible crash too.
This commit is contained in:
Thomas Haller 2017-01-13 17:13:24 +01:00
parent f0cd2403d4
commit c69ad50b07
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/devices/nm-device.c
View file

@ -1648,14 +1648,13 @@ apply_mtu_from_config (NMDevice *self)
* stage, so it is an error to call this function if the IPv4 method is not
* 'disabled'.
*/
s_ip4 = (NMSettingIPConfig *)
nm_device_get_applied_setting (self, NM_TYPE_SETTING_IP4_CONFIG);
s_ip4 = (NMSettingIPConfig *) nm_device_get_applied_setting (self, NM_TYPE_SETTING_IP4_CONFIG);
if (s_ip4)
method = nm_setting_ip_config_get_method (s_ip4);
g_return_if_fail (nm_streq (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED));
s_wired = (NMSettingWired *)
nm_device_get_applied_setting (self, NM_TYPE_SETTING_WIRED);
g_return_if_fail (nm_streq0 (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED));
s_wired = (NMSettingWired *) nm_device_get_applied_setting (self, NM_TYPE_SETTING_WIRED);
if (s_wired) {
mtu = nm_setting_wired_get_mtu (s_wired);