diff options
| author | Michael Biebl <biebl@debian.org> | 2025-08-01 19:15:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-08-01 19:15:13 +0200 |
| commit | 7e9091a5960f67a84787c03153324915220e4816 (patch) | |
| tree | dc743de962532932ebc3b4ed3a36ddd093d97d68 /src/core/settings/plugins | |
| parent | 582eb4472a0f3375042afb9026cbeb50e058a27d (diff) | |
New upstream version 1.54.0 upstream/1.54.0
Diffstat (limited to 'src/core/settings/plugins')
4 files changed, 9 insertions, 11 deletions
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index d64052cb..1e2e2d92 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -1439,7 +1439,7 @@ next:; : "")); break; case PARSE_LINE_TYPE_FLAG: - /* NOTE: the flag (for "onlink") only allows to explicitly set "TRUE". + /* NOTE: the flag (for "onlink") only allows setting "TRUE" explicitly. * There is no way to express an explicit "FALSE" setting * of this attribute, hence, the file format cannot encode * that configuration. */ 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 6e0411c6..39cbddc5 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 @@ -3769,7 +3769,7 @@ nms_ifcfg_rh_writer_write_connection(NMConnection *connection, * * FIXME: a much better solution might be, to re-read the connection only based * on the in-memory representation of what we collected above. But the reader - * does not yet allow to inject the configuration. */ + * does not yet allow one to inject the configuration. */ if (out_reread || out_reread_same) { gs_unref_object NMConnection *reread = NULL; gboolean reread_same = FALSE; diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index ea978a98..2f3035ef 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -255,8 +255,8 @@ _assert_expected_content(NMConnection *connection, const char *filename, const c GError *_error = NULL; \ gboolean _success; \ \ - g_assert(_ifcfg_dir &&_ifcfg_dir[0]); \ - g_assert(_filename &&_filename[0]); \ + g_assert(_ifcfg_dir && _ifcfg_dir[0]); \ + g_assert(_filename && _filename[0]); \ \ _success = nms_ifcfg_rh_writer_write_connection(_connection, \ _ifcfg_dir, \ @@ -9533,12 +9533,10 @@ test_svUnescape(void) .exp = v_expected, \ .can_concat = !!v_expected, \ } -#define V2(v_value, v_expected) \ - { \ - .val = "" v_value "", \ - .exp = v_expected, \ - .can_concat = TRUE, \ - .needs_ascii_separator = TRUE, \ +#define V2(v_value, v_expected) \ + { \ + .val = "" v_value "", .exp = v_expected, .can_concat = TRUE, \ + .needs_ascii_separator = TRUE, \ } const UnescapeTestData data_full[] = { V1("", ""), diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index 6b6913c5..df5dfd40 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -61,7 +61,7 @@ check_ip_route(NMSettingIPConfig *config, gs_free_error GError *_error = NULL; \ NMConnection *_connection; \ \ - g_assert(full_filename &&full_filename[0] == '/'); \ + g_assert(full_filename && full_filename[0] == '/'); \ \ _connection = \ nms_keyfile_reader_from_file(full_filename, \ |