From e5a6e16ce010852db568d5edaf5be481bb43b376 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 15 Jun 2023 18:20:18 +0200 Subject: [PATCH] keyfile/tests: rename internal test-only function to have nmtst prefix We have some interal code that is only used to expose functionality for the tests. Those functions should be easily distinguishable from code that is used by the "real" code. Give a "nmtst" prefix. Rename nms_keyfile_writer_test_connection() to nmtst_keyfile_writer_test_connection(). --- .../plugins/keyfile/nms-keyfile-writer.c | 16 ++++++++-------- .../plugins/keyfile/nms-keyfile-writer.h | 16 ++++++++-------- .../keyfile/tests/test-keyfile-settings.c | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c index ad6f277ce3..12e6993fa2 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c @@ -458,14 +458,14 @@ nms_keyfile_writer_connection(NMConnection *connection, } gboolean -nms_keyfile_writer_test_connection(NMConnection *connection, - const char *keyfile_dir, - uid_t owner_uid, - pid_t owner_grp, - char **out_path, - NMConnection **out_reread, - gboolean *out_reread_same, - GError **error) +nmtst_keyfile_writer_test_connection(NMConnection *connection, + const char *keyfile_dir, + uid_t owner_uid, + pid_t owner_grp, + char **out_path, + NMConnection **out_reread, + gboolean *out_reread_same, + GError **error) { return _internal_write_connection(connection, FALSE, diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.h b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h index 62aaa19da7..cb7050a4d9 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.h +++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h @@ -30,13 +30,13 @@ gboolean nms_keyfile_writer_connection(NMConnection *connectio gboolean *out_reread_same, GError **error); -gboolean nms_keyfile_writer_test_connection(NMConnection *connection, - const char *keyfile_dir, - uid_t owner_uid, - pid_t owner_grp, - char **out_path, - NMConnection **out_reread, - gboolean *out_reread_same, - GError **error); +gboolean nmtst_keyfile_writer_test_connection(NMConnection *connection, + const char *keyfile_dir, + uid_t owner_uid, + pid_t owner_grp, + char **out_path, + NMConnection **out_reread, + gboolean *out_reread_same, + GError **error); #endif /* __NMS_KEYFILE_WRITER_H__ */ 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 83019babb1..866b1ffd34 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -138,14 +138,14 @@ write_test_connection_reread(NMConnection *connection, connection_normalized = nmtst_connection_duplicate_and_normalize(connection); - success = nms_keyfile_writer_test_connection(connection_normalized, - TEST_SCRATCH_DIR, - owner_uid, - owner_grp, - testfile, - out_reread, - out_reread_same, - p_error); + success = nmtst_keyfile_writer_test_connection(connection_normalized, + TEST_SCRATCH_DIR, + owner_uid, + owner_grp, + testfile, + out_reread, + out_reread_same, + p_error); g_assert_no_error(error); g_assert(success); g_assert(*testfile && (*testfile)[0]);