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

initialize m_lastError, missing separator in LoadInstruction::execute

Browse Source
This commit is contained in:
john30
2016-03-26 11:06:12 +01:00
parent 5dcc76314f
commit d203f8c285
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+4 -2
View File
@@ -1304,9 +1304,9 @@ string Instruction::getDestination()
result_t LoadInstruction::execute(MessageMap* messages, ostringstream& log) { result_t LoadInstruction::execute(MessageMap* messages, ostringstream& log) {
result_t result = messages->readFromFile(m_filename, false, m_defaultDest, m_defaultCircuit, m_defaultSuffix); result_t result = messages->readFromFile(m_filename, false, m_defaultDest, m_defaultCircuit, m_defaultSuffix);
if (log.tellp()>0)
log << ", ";
if (result!=RESULT_OK) { if (result!=RESULT_OK) {
if (log.tellp()>0)
log << ", ";
log << "error " << (isSingleton() ? "loading " : "including ") << m_filename << " for \"" << getDestination() << "\": " << getResultCode(result); log << "error " << (isSingleton() ? "loading " : "including ") << m_filename << " for \"" << getDestination() << "\": " << getResultCode(result);
return result; return result;
} }
@@ -1558,6 +1558,7 @@ Message* MessageMap::getScanMessage(const unsigned char dstAddress)
} }
result_t MessageMap::resolveConditions(bool verbose) { result_t MessageMap::resolveConditions(bool verbose) {
m_lastError = "";
result_t overallResult = RESULT_OK; result_t overallResult = RESULT_OK;
for (map<string, Condition*>::iterator it = m_conditions.begin(); it != m_conditions.end(); it++) { for (map<string, Condition*>::iterator it = m_conditions.begin(); it != m_conditions.end(); it++) {
Condition* condition = it->second; Condition* condition = it->second;
@@ -1584,6 +1585,7 @@ result_t MessageMap::resolveCondition(Condition* condition) {
} }
result_t MessageMap::executeInstructions(bool verbose, ostringstream& log) { result_t MessageMap::executeInstructions(bool verbose, ostringstream& log) {
m_lastError = "";
result_t overallResult = RESULT_OK; result_t overallResult = RESULT_OK;
for (map<string, vector<Instruction*> >::iterator it = m_instructions.begin(); it != m_instructions.end(); it++) { for (map<string, vector<Instruction*> >::iterator it = m_instructions.begin(); it != m_instructions.end(); it++) {
vector<Instruction*> instructions = it->second; vector<Instruction*> instructions = it->second;