diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-05-10 22:32:45 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-05-12 13:43:36 +0200 |
| commit | a21714b82131230c54cd29657b42efef39319984 (patch) | |
| tree | 3e19c4abe14de2cfc3bbfe9ac96d96583822d4c0 | |
| parent | 46eb75d746202a563249ce0b2978450a925fd4e6 (diff) | |
| download | NetworkManager-a21714b82131230c54cd29657b42efef39319984.tar.gz | |
ifcfg-rh: cleanup write_wired_for_virtual() to return-early
| -rw-r--r-- | src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index a787e1e0cb..3d82167c9c 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -1082,7 +1082,9 @@ write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error) { NMSettingWired * s_wired; const char *const *s390_subchannels; - guint32 mtu, num_opts, i; + guint32 mtu; + guint32 num_opts; + guint32 i; const char *const *macaddr_blacklist; s_wired = nm_connection_get_setting_wired(connection); @@ -1182,33 +1184,31 @@ static gboolean write_wired_for_virtual(NMConnection *connection, shvarFile *ifcfg) { NMSettingWired *s_wired; - gboolean has_wired = FALSE; + const char * device_mac; + const char * cloned_mac; + guint32 mtu; s_wired = nm_connection_get_setting_wired(connection); - if (s_wired) { - const char *device_mac, *cloned_mac; - guint32 mtu; - - has_wired = TRUE; + if (!s_wired) + return FALSE; - device_mac = nm_setting_wired_get_mac_address(s_wired); - svSetValue(ifcfg, "HWADDR", device_mac ?: ""); + device_mac = nm_setting_wired_get_mac_address(s_wired); + svSetValue(ifcfg, "HWADDR", device_mac ?: ""); - cloned_mac = nm_setting_wired_get_cloned_mac_address(s_wired); - svSetValueStr(ifcfg, "MACADDR", cloned_mac); + cloned_mac = nm_setting_wired_get_cloned_mac_address(s_wired); + svSetValueStr(ifcfg, "MACADDR", cloned_mac); - svSetValueStr(ifcfg, - "GENERATE_MAC_ADDRESS_MASK", - nm_setting_wired_get_generate_mac_address_mask(s_wired)); + svSetValueStr(ifcfg, + "GENERATE_MAC_ADDRESS_MASK", + nm_setting_wired_get_generate_mac_address_mask(s_wired)); - svSetValueTernary(ifcfg, - "ACCEPT_ALL_MAC_ADDRESSES", - nm_setting_wired_get_accept_all_mac_addresses(s_wired)); + svSetValueTernary(ifcfg, + "ACCEPT_ALL_MAC_ADDRESSES", + nm_setting_wired_get_accept_all_mac_addresses(s_wired)); - mtu = nm_setting_wired_get_mtu(s_wired); - svSetValueInt64_cond(ifcfg, "MTU", mtu != 0, mtu); - } - return has_wired; + mtu = nm_setting_wired_get_mtu(s_wired); + svSetValueInt64_cond(ifcfg, "MTU", mtu != 0, mtu); + return TRUE; } static void |