keyfile: simplify code path in write_setting_value()

Avoid nested blocks. Check one condition after the other and handle it.
This commit is contained in:
Thomas Haller 2022-03-23 13:08:36 +01:00
parent a0db72bf6d
commit cfe594903e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728

View file

@ -3849,6 +3849,14 @@ write_setting_value(KeyfileWriterInfo *info,
_parse_info_find(setting, key, &setting_info, NULL, &pip);
if (pip && pip->has_writer_full) {
pip->writer_full(info, setting_info, property_info, pip, setting);
return;
}
if (pip && pip->writer_skip)
return;
if (!pip) {
if (!setting_info) {
/* the setting type is unknown. That is highly unexpected
@ -3865,13 +3873,6 @@ write_setting_value(KeyfileWriterInfo *info,
return;
if (nm_streq(key, NM_SETTING_NAME))
return;
} else {
if (pip->has_writer_full) {
pip->writer_full(info, setting_info, property_info, pip, setting);
return;
}
if (pip->writer_skip)
return;
}
nm_assert(property_info->param_spec);