diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-09-28 11:46:09 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-10-03 17:57:44 +0200 |
| commit | a33459ed2f8f91ded9dbce3b77d7afcbcfdf9510 (patch) | |
| tree | 5bea3d83575a6f43df9d16929741c5498060b8f0 | |
| parent | 2fcea1cf05af28dc76c015f2fef01d58dee9d2ba (diff) | |
| download | NetworkManager-a33459ed2f8f91ded9dbce3b77d7afcbcfdf9510.tar.gz | |
libnm/tests: drop redundant argument in test code
| -rw-r--r-- | src/libnm-core-impl/tests/test-general.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index a9e5d2e788..d214db5616 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -7975,8 +7975,11 @@ _check_uuid_v3(const char *expected_uuid, const char *str, gssize slen, char *uu g_free(uuid_test); } -#define check_uuid_v3(expected_uuid, str, strlen, ...) \ - _check_uuid_v3(expected_uuid, str, strlen, nm_uuid_generate_from_strings_v3(__VA_ARGS__, NULL)) +#define check_uuid_v3(expected_uuid, str, ...) \ + _check_uuid_v3(expected_uuid, \ + str, \ + NM_STRLEN(str), \ + nm_uuid_generate_from_strings_v3(__VA_ARGS__, NULL)) static void test_nm_utils_uuid_generate_from_strings(void) @@ -7998,20 +8001,20 @@ test_nm_utils_uuid_generate_from_strings(void) g_assert_cmpstr(NM_UUID_NS_1, ==, nm_uuid_unparse(&nm_uuid_ns_1, buf)); g_assert_cmpstr(NM_UUID_NS_ZERO, ==, nm_uuid_unparse(&nm_uuid_ns_zero, buf)); - check_uuid_v3("b07c334a-399b-32de-8d50-58e4e08f98e3", "", 0, NULL); - check_uuid_v3("b8a426cb-bcb5-30a3-bd8f-6786fea72df9", "\0", 1, ""); - check_uuid_v3("12a4a982-7aae-39e1-951e-41aeb1250959", "a\0", 2, "a"); - check_uuid_v3("69e22c7e-f89f-3a43-b239-1cb52ed8db69", "aa\0", 3, "aa"); - check_uuid_v3("59829fd3-5ad5-3d90-a7b0-4911747e4088", "\0\0", 2, "", ""); - check_uuid_v3("01ad0e06-6c50-3384-8d86-ddab81421425", "a\0\0", 3, "a", ""); - check_uuid_v3("e1ed8647-9ed3-3ec8-8c6d-e8204524d71d", "aa\0\0", 4, "aa", ""); - check_uuid_v3("fb1c7cd6-275c-3489-9382-83b900da8af0", "\0a\0", 3, "", "a"); - check_uuid_v3("5d79494e-c4ba-31a6-80a2-d6016ccd7e17", "a\0a\0", 4, "a", "a"); - check_uuid_v3("fd698d86-1b60-3ebe-855f-7aada9950a8d", "aa\0a\0", 5, "aa", "a"); - check_uuid_v3("8c573b48-0f01-30ba-bb94-c5f59f4fe517", "\0aa\0", 4, "", "aa"); - check_uuid_v3("2bdd3d46-eb83-3c53-a41b-a724d04b5544", "a\0aa\0", 5, "a", "aa"); - check_uuid_v3("13d4b780-07c1-3ba7-b449-81c4844ef039", "aa\0aa\0", 6, "aa", "aa"); - check_uuid_v3("dd265bf7-c05a-3037-9939-b9629858a477", "a\0b\0", 4, "a", "b"); + check_uuid_v3("b07c334a-399b-32de-8d50-58e4e08f98e3", "", NULL); + check_uuid_v3("b8a426cb-bcb5-30a3-bd8f-6786fea72df9", "\0", ""); + check_uuid_v3("12a4a982-7aae-39e1-951e-41aeb1250959", "a\0", "a"); + check_uuid_v3("69e22c7e-f89f-3a43-b239-1cb52ed8db69", "aa\0", "aa"); + check_uuid_v3("59829fd3-5ad5-3d90-a7b0-4911747e4088", "\0\0", "", ""); + check_uuid_v3("01ad0e06-6c50-3384-8d86-ddab81421425", "a\0\0", "a", ""); + check_uuid_v3("e1ed8647-9ed3-3ec8-8c6d-e8204524d71d", "aa\0\0", "aa", ""); + check_uuid_v3("fb1c7cd6-275c-3489-9382-83b900da8af0", "\0a\0", "", "a"); + check_uuid_v3("5d79494e-c4ba-31a6-80a2-d6016ccd7e17", "a\0a\0", "a", "a"); + check_uuid_v3("fd698d86-1b60-3ebe-855f-7aada9950a8d", "aa\0a\0", "aa", "a"); + check_uuid_v3("8c573b48-0f01-30ba-bb94-c5f59f4fe517", "\0aa\0", "", "aa"); + check_uuid_v3("2bdd3d46-eb83-3c53-a41b-a724d04b5544", "a\0aa\0", "a", "aa"); + check_uuid_v3("13d4b780-07c1-3ba7-b449-81c4844ef039", "aa\0aa\0", "aa", "aa"); + check_uuid_v3("dd265bf7-c05a-3037-9939-b9629858a477", "a\0b\0", "a", "b"); } static void |