jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Convert sscanf in ProtocolNexa and ProtocolWaveman to a faster and platform independent implementation

Browse source
This commit is contained in:
Micke Prag 2012-06-19 16:48:44 +02:00
parent 818ae8abed
commit 7b82e529cc
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
telldus-core/service/ProtocolNexa.cpp
View file

@ -165,10 +165,7 @@ std::string ProtocolNexa::getStringSelflearningForCode(int intHouse, int intCode
} }
std::string ProtocolNexa::decodeData(const ControllerMessage& dataMsg) { std::string ProtocolNexa::decodeData(const ControllerMessage& dataMsg) {
uint32_t allData = 0; uint64_t allData = dataMsg.getInt64Parameter("data");
// TODO(micke): Convert sscanf. This is slow and can overflow buffers!
sscanf(dataMsg.getParameter("data").c_str(), "%lx", reinterpret_cast<long*>(&allData)); // NOLINT
if(TelldusCore::comparei(dataMsg.model(), L"selflearning")) { if(TelldusCore::comparei(dataMsg.model(), L"selflearning")) {
// selflearning // selflearning
@ -179,7 +176,7 @@ std::string ProtocolNexa::decodeData(const ControllerMessage& dataMsg) {
} }
} }
std::string ProtocolNexa::decodeDataSelfLearning(uint32_t allData) { std::string ProtocolNexa::decodeDataSelfLearning(uint64_t allData) {
unsigned int house = 0; unsigned int house = 0;
unsigned int unit = 0; unsigned int unit = 0;
unsigned int group = 0; unsigned int group = 0;
@ -216,7 +213,7 @@ std::string ProtocolNexa::decodeDataSelfLearning(uint32_t allData) {
return retString.str(); return retString.str();
} }
std::string ProtocolNexa::decodeDataCodeSwitch(uint32_t allData) { std::string ProtocolNexa::decodeDataCodeSwitch(uint64_t allData) {
unsigned int house = 0; unsigned int house = 0;
unsigned int unit = 0; unsigned int unit = 0;
unsigned int method = 0; unsigned int method = 0;

4
telldus-core/service/ProtocolNexa.h
View file

@ -28,8 +28,8 @@ protected:
private: private:
static int lastArctecCodeSwitchWasTurnOff; static int lastArctecCodeSwitchWasTurnOff;
static std::string decodeDataCodeSwitch(uint32_t allData); static std::string decodeDataCodeSwitch(uint64_t allData);
static std::string decodeDataSelfLearning(uint32_t allData); static std::string decodeDataSelfLearning(uint64_t allData);
}; };
#endif // TELLDUS_CORE_SERVICE_PROTOCOLNEXA_H_ #endif // TELLDUS_CORE_SERVICE_PROTOCOLNEXA_H_

5
telldus-core/service/ProtocolWaveman.cpp
View file

@ -25,13 +25,12 @@ std::string ProtocolWaveman::getOffCode() const {
} }
std::string ProtocolWaveman::decodeData(const ControllerMessage& dataMsg) { std::string ProtocolWaveman::decodeData(const ControllerMessage& dataMsg) {
uint32_t allData = 0; uint64_t allData = 0;
unsigned int house = 0; unsigned int house = 0;
unsigned int unit = 0; unsigned int unit = 0;
unsigned int method = 0; unsigned int method = 0;
// TODO(micke): Convert sscanf. This is slow and can overflow buffers! allData = dataMsg.getInt64Parameter("data");
sscanf(dataMsg.getParameter("data").c_str(), "%lx", reinterpret_cast<long*>(&allData)); // NOLINT
method = allData & 0xF00; method = allData & 0xF00;
method >>= 8; method >>= 8;