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

fix for previous commit

Browse Source
This commit is contained in:
john30
2015-03-12 23:40:54 +01:00
parent f1be064dda
commit be99a12d04
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+3 -3
View File
@@ -376,7 +376,7 @@ result_t Message::decode(const PartType partType, SymbolString& data,
m_lastSlaveData = data; m_lastSlaveData = data;
} }
} }
return RESULT_OK; return result;
} }
result_t Message::decode(SymbolString& masterData, SymbolString& slaveData, result_t Message::decode(SymbolString& masterData, SymbolString& slaveData,
@@ -406,7 +406,7 @@ result_t Message::decode(SymbolString& masterData, SymbolString& slaveData,
m_lastChangeTime = m_lastUpdateTime; m_lastChangeTime = m_lastUpdateTime;
m_lastSlaveData = slaveData; m_lastSlaveData = slaveData;
} }
return RESULT_OK; return result;
} }
result_t Message::decodeLastData(ostringstream& output, result_t Message::decodeLastData(ostringstream& output,
@@ -427,7 +427,7 @@ result_t Message::decodeLastData(ostringstream& output,
return result; return result;
if (empty && result == RESULT_EMPTY && fieldName != NULL) if (empty && result == RESULT_EMPTY && fieldName != NULL)
return RESULT_ERR_NOTFOUND; return RESULT_ERR_NOTFOUND;
return RESULT_OK; return result;
} }
bool Message::isLessPollWeight(const Message* other) bool Message::isLessPollWeight(const Message* other)