nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix previous commit: keep types without WLS flag stored with length suffix as well

Browse Source
This commit is contained in:
John
2021-11-05 11:05:32 +01:00
parent d5b7a257f0
commit c8a41f0999
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/datatype.cpp
+3 -3
View File
@@ -1151,7 +1151,7 @@ void DataTypeList::clear() {
} }
result_t DataTypeList::add(const DataType* dataType) { result_t DataTypeList::add(const DataType* dataType) {
if (!dataType->isAdjustableLength() && dataType->hasFlag(WLS)) { if (!dataType->isAdjustableLength()) {
ostringstream str; ostringstream str;
size_t bitCount = dataType->getBitCount(); size_t bitCount = dataType->getBitCount();
str << dataType->getId() << LENGTH_SEPARATOR << static_cast<unsigned>(bitCount >= 8 ? bitCount/8 : bitCount); str << dataType->getId() << LENGTH_SEPARATOR << static_cast<unsigned>(bitCount >= 8 ? bitCount/8 : bitCount);
@@ -1159,9 +1159,9 @@ result_t DataTypeList::add(const DataType* dataType) {
return RESULT_ERR_DUPLICATE_NAME; // duplicate key return RESULT_ERR_DUPLICATE_NAME; // duplicate key
} }
m_typesByIdLength[str.str()] = dataType; m_typesByIdLength[str.str()] = dataType;
if (m_typesById.find(dataType->getId()) != m_typesById.end()) { if (dataType->hasFlag(WLS) || m_typesById.find(dataType->getId()) != m_typesById.end()) {
m_cleanupTypes.push_back(dataType); m_cleanupTypes.push_back(dataType);
return RESULT_OK; // only store first one as default return RESULT_OK; // only store first one without WLS flag as default
} }
} else if (m_typesById.find(dataType->getId()) != m_typesById.end()) { } else if (m_typesById.find(dataType->getId()) != m_typesById.end()) {
return RESULT_ERR_DUPLICATE_NAME; // duplicate key return RESULT_ERR_DUPLICATE_NAME; // duplicate key