repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: fixed int parameter sizes and some signed/unsigned warnings. will need to be...
[deb_libcec.git]
/
src
/
testclient
/
main.cpp
diff --git
a/src/testclient/main.cpp
b/src/testclient/main.cpp
index f2f2bf3e0a9678338fc8b347b38d6afc853b0006..983ba13736fff90d6b3b16c9fce8985206ead71c 100644
(file)
--- a/
src/testclient/main.cpp
+++ b/
src/testclient/main.cpp
@@
-45,11
+45,23
@@
using namespace std;
#define CEC_TEST_CLIENT_VERSION 3
#define CEC_TEST_CLIENT_VERSION 3
-inline bool HexStrToInt(const std::string& data,
in
t& value)
+inline bool HexStrToInt(const std::string& data,
uint8_
t& value)
{
{
- return sscanf(data.c_str(), "%x", &value) == 1;
-}
+ int iTmp(0);
+ if (sscanf(data.c_str(), "%x", &iTmp) == 1)
+ {
+ if (iTmp > 256)
+ value = 255;
+ else if (iTmp < 0)
+ value = 0;
+ else
+ value = (uint8_t) iTmp;
+ return true;
+ }
+
+ return false;
+}
//get the first word (separated by whitespace) from string data and place that in word
//then remove that word from string data
//get the first word (separated by whitespace) from string data and place that in word
//then remove that word from string data
@@
-254,7
+266,7
@@
int main (int argc, char *argv[])
if (command == "tx")
{
string strvalue;
if (command == "tx")
{
string strvalue;
-
int
ivalue;
+
uint8_t
ivalue;
vector<uint8_t> bytes;
while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
bytes.push_back(ivalue);
vector<uint8_t> bytes;
while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
bytes.push_back(ivalue);