diff --git a/src/activities/network/CalibreWirelessActivity.cpp b/src/activities/network/CalibreWirelessActivity.cpp index d6df713a..ee5e45a9 100644 --- a/src/activities/network/CalibreWirelessActivity.cpp +++ b/src/activities/network/CalibreWirelessActivity.cpp @@ -433,8 +433,10 @@ bool CalibreWirelessActivity::readJsonMessage(std::string& message) { const char* lengthKey = "\"length\""; for (size_t i = bracketPos; i < recvBuffer.size() && i < bracketPos + 2000; i++) { char c = recvBuffer[i]; - if (c == '{' || c == '[') depth++; - else if (c == '}' || c == ']') depth--; + if (c == '{' || c == '[') + depth++; + else if (c == '}' || c == ']') + depth--; else if (depth == 2 && c == '"' && i + 8 <= recvBuffer.size()) { bool match = true; for (size_t j = 0; j < 8 && match; j++) { @@ -674,8 +676,10 @@ void CalibreWirelessActivity::handleSendBook(const std::string& data) { for (size_t i = 0; i < data.size(); i++) { char c = data[i]; - if (c == '{' || c == '[') depth++; - else if (c == '}' || c == ']') depth--; + if (c == '{' || c == '[') + depth++; + else if (c == '}' || c == ']') + depth--; else if (depth == 1 && c == '"' && i + 8 <= data.size()) { bool match = true; for (size_t j = 0; j < 8 && match; j++) { diff --git a/src/activities/network/CalibreWirelessActivity.h b/src/activities/network/CalibreWirelessActivity.h index a84cebd8..4af89525 100644 --- a/src/activities/network/CalibreWirelessActivity.h +++ b/src/activities/network/CalibreWirelessActivity.h @@ -19,15 +19,7 @@ * https://github.com/kovidgoyal/calibre/blob/master/src/calibre/devices/smart_device_app/driver.py */ class CalibreWirelessActivity final : public Activity { - enum class WirelessState { - DISCOVERING, - CONNECTING, - WAITING, - RECEIVING, - COMPLETE, - DISCONNECTED, - ERROR - }; + enum class WirelessState { DISCOVERING, CONNECTING, WAITING, RECEIVING, COMPLETE, DISCONNECTED, ERROR }; enum OpCode : uint8_t { OK = 0,