diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-06-08 13:36:59 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-06-08 14:32:55 +0200 |
| commit | 68685e85480d5539ba0bb884c4ebeaa8c31a07f9 (patch) | |
| tree | c8ea5826d4853b5c2abf69a0dbf3c7b774deab6f /lib/base | |
| parent | 3b29e9279367292962046494cf0da1b24827c269 (diff) | |
| download | enigma2-68685e85480d5539ba0bb884c4ebeaa8c31a07f9.tar.gz enigma2-68685e85480d5539ba0bb884c4ebeaa8c31a07f9.zip | |
fix compiler warnings
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/ebase.cpp | 2 | ||||
| -rw-r--r-- | lib/base/estring.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index c84f28b8..700cce36 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -165,7 +165,7 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn) return; } for (i = notifiers.begin(); i != notifiers.end(); ++i) - eDebug("fd=%d, sn=%d", i->second->getFD(), (void*)i->second); + eDebug("fd=%d, sn=%p", i->second->getFD(), (void*)i->second); eFatal("removed socket notifier which is not present, fd=%d", fd); } diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp index e7dc2bec..f2ac7325 100644 --- a/lib/base/estring.cpp +++ b/lib/base/estring.cpp @@ -424,7 +424,7 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts break; } - bool useTwoCharMapping = !table || tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid); + bool useTwoCharMapping = !table || (tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid)); if (useTwoCharMapping && table == 5) { // i hope this dont break other transponders which realy use ISO8859-5 and two char byte mapping... // eDebug("Cyfra / Cyfrowy Polsat HACK... override given ISO8859-5 with ISO6397"); |