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:41:31 +01:00
parent be99a12d04
commit b85f244212
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+4 -2
View File
@@ -312,10 +312,12 @@ string MainLoop::executeRead(vector<string> &args)
if (ret == RESULT_OK) { if (ret == RESULT_OK) {
ret = message->decode(pt_slaveData, slave, result, false, verbose, fieldIndex==-2 ? NULL : fieldName.c_str(), fieldIndex); ret = message->decode(pt_slaveData, slave, result, false, verbose, fieldIndex==-2 ? NULL : fieldName.c_str(), fieldIndex);
} }
if (ret != RESULT_OK) { if (ret < RESULT_OK) {
logError(lf_main, "read: %s", getResultCode(ret)); logError(lf_main, "read: %s", getResultCode(ret));
return getResultCode(ret); return getResultCode(ret);
} }
if (ret > RESULT_OK)
return getResultCode(ret);
return result.str(); return result.str();
} }
@@ -407,7 +409,7 @@ string MainLoop::executeWrite(vector<string> &args)
return getResultCode(RESULT_OK); return getResultCode(RESULT_OK);
ret = message->decode(pt_slaveData, slave, result); // decode data ret = message->decode(pt_slaveData, slave, result); // decode data
if (ret == RESULT_OK && result.str().empty()) if (ret >= RESULT_OK && result.str().empty())
return getResultCode(RESULT_OK); return getResultCode(RESULT_OK);
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {