git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update languages: es, tr
[enigma2.git]
/
lib
/
base
/
estring.cpp
diff --git
a/lib/base/estring.cpp
b/lib/base/estring.cpp
index 429c261ff9ca96b57f6cf6bea7fbd6e9f06d77ad..5d15ddce01234b3e3a70d8cfeb90d42352e1ab28 100644
(file)
--- a/
lib/base/estring.cpp
+++ b/
lib/base/estring.cpp
@@
-10,10
+10,10
@@
std::string buildShortName( const std::string &str )
std::string tmp;
static char stropen[3] = { 0xc2, 0x86, 0x00 };
static char strclose[3] = { 0xc2, 0x87, 0x00 };
std::string tmp;
static char stropen[3] = { 0xc2, 0x86, 0x00 };
static char strclose[3] = { 0xc2, 0x87, 0x00 };
-
unsigned in
t open=std::string::npos-1;
+
size_
t open=std::string::npos-1;
while ( (open = str.find(stropen, open+2)) != std::string::npos )
{
while ( (open = str.find(stropen, open+2)) != std::string::npos )
{
-
unsigned in
t 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) );
}
if ( close != std::string::npos )
tmp+=str.substr( open+2, close-(open+2) );
}
@@
-27,9
+27,9
@@
std::string getNum(int val, int sys)
char buf[12];
if (sys == 10)
char buf[12];
if (sys == 10)
- s
td::s
nprintf(buf, 12, "%i", val);
+ snprintf(buf, 12, "%i", val);
else if (sys == 16)
else if (sys == 16)
- s
td::snprintf(buf, 12, "%X", val);
+ s
nprintf(buf, 12, "%X", val);
std::string res;
res.assign(buf);
std::string res;
res.assign(buf);
@@
-362,7
+362,7
@@
std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
switch(n)
{
case 12:
switch(n)
{
case 12:
- eDebug("unsup. ISO8859-12 enc."
, n
);
+ eDebug("unsup. ISO8859-12 enc.");
break;
default:
table=n;
break;
default:
table=n;