From e08bb66b340b374c176e8bbfaec50439fc0ba400 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 May 2020 08:27:07 +0200 Subject: [PATCH] keyfile,config: use nm_keyfile_error_is_not_found() helper --- shared/nm-keyfile/nm-keyfile.c | 8 ++------ 1 file 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,