fix lengthfield parsing

[enigma2.git] / lib / base / estring.h

diff --git a/lib/base/estring.h b/lib/base/estring.h
index a0b161de99059ec2a01511a0cd51319a73126601..b997911cf5e4ed830c92c338c71a90ab636e8eba 100644 (file)
--- a/lib/base/estring.h
+++ b/lib/base/estring.h
@@ -9,10 +9,18 @@
 int strnicmp(const char*, const char*, int);
 
 std::string getNum(int num, int base=10);
 int strnicmp(const char*, const char*, int);
 
 std::string getNum(int num, int base=10);

-std::string convertDVBUTF8(const unsigned char *data, int len, int table=5);
-std::string convertUTF8DVB(const std::string &string);  // with default ISO8859-5
-std::string convertDVBUTF8(const std::string &s, int table=5);
+
+std::string convertDVBUTF8(const unsigned char *data, int len, int table=0, int tsidonid=0); // with default ISO8859-1/Latin1
+std::string convertUTF8DVB(const std::string &string, int table=0); // with default ISO8859-1/Latin1

 std::string convertLatin1UTF8(const std::string &string);
 int isUTF8(const std::string &string);
 
 std::string convertLatin1UTF8(const std::string &string);
 int isUTF8(const std::string &string);
 

+std::string removeDVBChars(const std::string &s);
+void makeUpper(std::string &s);
+
+inline std::string convertDVBUTF8(const std::string &string, int table=0, int tsidonid=0) // with default ISO8859-1/Latin1
+{
+       return convertDVBUTF8((const unsigned char*)string.c_str(), string.length(), table, tsidonid);
+}
+

 #endif // __E_STRING__
 #endif // __E_STRING__