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

formatting

Browse Source
This commit is contained in:
john30
2016-12-23 14:00:01 +01:00
parent be55283b5d
commit a1952df4dc
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
Regular → Executable
+12 -8
View File
@@ -1676,8 +1676,9 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
string types = *restart; string types = *restart;
Condition* condition = NULL; Condition* condition = NULL;
result_t result = readConditions(types, filename, condition); result_t result = readConditions(types, filename, condition);
if (result!=RESULT_OK) if (result!=RESULT_OK) {
return result; return result;
}
if (types.length()>0 && types[0]=='!') { if (types.length()>0 && types[0]=='!') {
// instruction // instruction
types = types.substr(1); types = types.substr(1);
@@ -1697,11 +1698,11 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
} }
return RESULT_OK; return RESULT_OK;
} }
if (types.length() == 0) if (types.length() == 0) {
types.append("r"); types.append("r");
else if (types.find(']')!=string::npos) } else if (types.find(']')!=string::npos) {
return RESULT_ERR_INVALID_ARG; return RESULT_ERR_INVALID_ARG;
}
result = RESULT_ERR_EOF; result = RESULT_ERR_EOF;
DataFieldTemplates* templates = getTemplates(filename); DataFieldTemplates* templates = getTemplates(filename);
istringstream stream(types); istringstream stream(types);
@@ -1717,16 +1718,19 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
Message* message = *it; Message* message = *it;
if (result == RESULT_OK) { if (result == RESULT_OK) {
result = add(message); result = add(message);
if (result==RESULT_ERR_DUPLICATE_NAME) if (result==RESULT_ERR_DUPLICATE_NAME) {
begin = restart+3; // mark name as invalid begin = restart+3; // mark name as invalid
else if (result==RESULT_ERR_DUPLICATE) } else if (result==RESULT_ERR_DUPLICATE) {
begin = restart+8; // mark ID as invalid begin = restart+8; // mark ID as invalid
}
} }
if (result != RESULT_OK) if (result != RESULT_OK) {
delete message; // delete all remaining messages on error delete message; // delete all remaining messages on error
}
} }
if (result != RESULT_OK) if (result != RESULT_OK) {
return result; return result;
}
} }
return result; return result;
} }