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

compiler warningsdiff

Browse Source
This commit is contained in:
john30
2017-05-28 09:28:46 +02:00
parent 8f4e1bc865
commit a0c03779a1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/datatype.cpp
+2 -2
View File
@@ -852,7 +852,7 @@ result_t NumberDataType::writeSymbols(size_t offset, size_t length, istringstrea
dvalue = round(dvalue * m_divisor);
}
if (hasFlag(SIG)) {
if (dvalue < -(1LL << (8 * length)) || dvalue >= (1LL << (8 * length))) {
if (dvalue < -exp2((8 * (double)length) - 1) || dvalue >= exp2((8 * (double)length) - 1)) {
return RESULT_ERR_OUT_OF_RANGE; // value out of range
}
if (dvalue < 0 && m_bitCount != 32) {
@@ -861,7 +861,7 @@ result_t NumberDataType::writeSymbols(size_t offset, size_t length, istringstrea
value = static_cast<int>(dvalue);
}
} else {
if (dvalue < 0.0 || dvalue >= (1LL << (8 * length))) {
if (dvalue < 0.0 || dvalue >= exp2(8 * (double)length)) {
return RESULT_ERR_OUT_OF_RANGE; // value out of range
}
value = (unsigned int)dvalue;
src/lib/ebus/message.cpp
+1 -1
View File
@@ -758,7 +758,7 @@ result_t Message::decodeLastData(bool master, bool leadingSeparator, const char*
result_t Message::decodeLastData(bool leadingSeparator, const char* fieldName,
ssize_t fieldIndex, const OutputFormat outputFormat, ostream* output) const {
ssize_t startPos = output->tellp();
ostream::pos_type startPos = output->tellp();
result_t result = m_data->read(m_lastMasterData, getIdLength(), leadingSeparator, fieldName, fieldIndex,
outputFormat, -1, output);
if (result < RESULT_OK) {