diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 08:27:07 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-06 08:21:57 +0200 |
| commit | 0f39f35296aa906d162eec4cce16625ee188e852 (patch) | |
| tree | d69798bb635ced21c31d0e1472bc970834937f7b | |
| parent | 275027e9ad608b68d6888e9d62bc2ab610ecd736 (diff) | |
| download | NetworkManager-0f39f35296aa906d162eec4cce16625ee188e852.tar.gz | |
keyfile,config: use nm_keyfile_error_is_not_found() helper
| -rw-r--r-- | shared/nm-keyfile/nm-keyfile.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c index c98fbdf2bb..0caef893e0 100644 --- a/shared/nm-keyfile/nm-keyfile.c +++ b/shared/nm-keyfile/nm-keyfile.c @@ -1622,9 +1622,7 @@ parity_good: out_err: if (!err) return; - if ( err->domain == G_KEY_FILE_ERROR - && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND, - G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { + if (nm_keyfile_error_is_not_found (err)) { /* ignore such errors. The key is not present. */ return; } @@ -3154,9 +3152,7 @@ read_one_setting_value (KeyfileReaderInfo *info, g_return_if_reached (); if (err) { - if ( err->domain == G_KEY_FILE_ERROR - && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND, - G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { + if (nm_keyfile_error_is_not_found (err)) { /* ignore such errors. The key is not present. */ } else { handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN, |