git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add SWIG_VOID, add tyemap_output_ptr
[enigma2.git]
/
lib
/
base
/
estring.cpp
diff --git
a/lib/base/estring.cpp
b/lib/base/estring.cpp
index f0107b6aba03ef6e7fe477763099100505b30cc7..aee1742924baafced4b36652a0f679777100b18d 100644
(file)
--- a/
lib/base/estring.cpp
+++ b/
lib/base/estring.cpp
@@
-3,6
+3,7
@@
#include <limits.h>
#include <lib/base/elock.h>
#include <lib/base/eerror.h>
#include <limits.h>
#include <lib/base/elock.h>
#include <lib/base/eerror.h>
+#include <lib/base/estring.h>
static pthread_mutex_t lock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
static pthread_mutex_t lock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
@@
-181,7
+182,12
@@
static inline unsigned int recode(unsigned char d, int cp)
}
}
}
}
-std::string convertDVBUTF8(unsigned char *data, int len, int table)
+std::string convertDVBUTF8(const std::string &s, int table)
+{
+ return convertDVBUTF8((const unsigned char*)s.c_str(), s.size(), table);
+}
+
+std::string convertDVBUTF8(const unsigned char *data, int len, int table)
{
int i;
if (!len)
{
int i;
if (!len)