X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b14f1520fe0dabd185ab3555c9d2dd8ab5276dd0..d0af96f7a28831d6f8c11fb224d483e6eb92b677:/lib/base/estring.cpp diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp index 487dceec..5d15ddce 100644 --- a/lib/base/estring.cpp +++ b/lib/base/estring.cpp @@ -10,15 +10,12 @@ std::string buildShortName( const std::string &str ) std::string tmp; static char stropen[3] = { 0xc2, 0x86, 0x00 }; static char strclose[3] = { 0xc2, 0x87, 0x00 }; - unsigned int open=std::string::npos-1; + size_t open=std::string::npos-1; while ( (open = str.find(stropen, open+2)) != std::string::npos ) { - unsigned int close = str.find(strclose, open); + size_t close = str.find(strclose, open); if ( close != std::string::npos ) - { tmp+=str.substr( open+2, close-(open+2) ); - eDebug("now %s", tmp.c_str()); - } } return tmp.length() ? tmp : str; } @@ -30,9 +27,9 @@ std::string getNum(int val, int sys) char buf[12]; if (sys == 10) - std::snprintf(buf, 12, "%i", val); + snprintf(buf, 12, "%i", val); else if (sys == 16) - std::snprintf(buf, 12, "%X", val); + snprintf(buf, 12, "%X", val); std::string res; res.assign(buf); @@ -365,7 +362,7 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts switch(n) { case 12: - eDebug("unsup. ISO8859-12 enc.", n); + eDebug("unsup. ISO8859-12 enc."); break; default: table=n;