This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch support/2.4 in repository https://gitbox.apache.org/repos/asf/celix.git
commit 7d8c78df17edd3a4e08bd47d5299e298dcd34dc6 Author: xuzhenbao <[email protected]> AuthorDate: Mon Nov 27 09:59:03 2023 +0800 Remove duplicate name checking for complex elements,it should be done at build time (cherry picked from commit bd931c0667f5e34fd68762b8fb411215b7da3cb8) --- libs/dfi/gtest/src/dyn_type_tests.cpp | 7 ------- libs/dfi/src/dyn_type.c | 8 -------- 2 files changed, 15 deletions(-) diff --git a/libs/dfi/gtest/src/dyn_type_tests.cpp b/libs/dfi/gtest/src/dyn_type_tests.cpp index dda8efd1..9cb23876 100644 --- a/libs/dfi/gtest/src/dyn_type_tests.cpp +++ b/libs/dfi/gtest/src/dyn_type_tests.cpp @@ -326,13 +326,6 @@ TEST_F(DynTypeTests, NrOfEntriesTest) { dynType_destroy(type); } -TEST_F(DynTypeTests, ComplexHasDuplicateName) { - dyn_type *type = NULL; - auto rc = dynType_parseWithStr(R"({II a a})", nullptr, nullptr, &type); - ASSERT_EQ(3, rc); - celix_err_printErrors(stderr, nullptr, nullptr); -} - TEST_F(DynTypeTests, ComplexHasEmptyName) { dyn_type *type = NULL; auto rc = dynType_parseWithStr(R"({II a })", nullptr, nullptr, &type); diff --git a/libs/dfi/src/dyn_type.c b/libs/dfi/src/dyn_type.c index 6ed3bb4f..df2021bf 100644 --- a/libs/dfi/src/dyn_type.c +++ b/libs/dfi/src/dyn_type.c @@ -296,14 +296,6 @@ static int dynType_parseComplex(FILE *stream, dyn_type *type) { if (status == OK) { TAILQ_FOREACH(entry, &type->complex.entriesHead, entries) { count +=1; - struct complex_type_entry *entry2 = NULL; - for(entry2 = entry->entries.tqe_next; entry2 != NULL; entry2 = entry2->entries.tqe_next) { - if (entry2->name != NULL && entry->name != NULL && strcmp(entry2->name, entry->name) == 0) { - status = PARSE_ERROR; - LOG_ERROR("Error duplicate name '%s'", entry->name); - break; - } - } } }
