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

corrected using fieldIndex in Message::decodeLastData(bool, ...), corrected finding field in DataFieldSet::read() with index and without name, added optional partType and fieldName to DataField::getCount()

Browse Source
This commit is contained in:
john30
2017-12-26 13:56:26 +01:00
parent 1da2611964
commit c680e87bde
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.h
+5 -3
View File
@@ -251,9 +251,11 @@ class DataField : public AttributedItem {
/**
* Get the field count (excluding ignored fields).
* @param partType the optional part to count, or @ pt_any.
* @param fieldName the optional field name to count, or NULL.
* @return the field count (excluding ignored fields).
*/
virtual size_t getCount() const = 0;
virtual size_t getCount(PartType partType = pt_any, const char* fieldName = NULL) const = 0;
/**
* Get the specified field name.
@@ -399,7 +401,7 @@ class SingleDataField : public DataField {
bool hasFullByteOffset(bool after) const;
// @copydoc
size_t getCount() const override { return isIgnored() ? 0 : 1; }
size_t getCount(PartType partType = pt_any, const char* fieldName = NULL) const override;
// @copydoc
virtual string getName(ssize_t fieldIndex) const {
@@ -638,7 +640,7 @@ class DataFieldSet : public DataField {
size_t getLength(PartType partType, size_t maxLength) const override;
// @copydoc
size_t getCount() const override { return m_fields.size() - m_ignoredCount; }
size_t getCount(PartType partType = pt_any, const char* fieldName = NULL) const override;
// @copydoc
string getName(ssize_t fieldIndex) const override;