fix: large integer implicitly truncated to unsigned type,

     comparison is always true due to limited range of data type
     too many arguments for format

diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index 429c261ff9ca96b57f6cf6bea7fbd6e9f06d77ad..ce36a002934d2585bee90311c8e89c2d9435c7bc 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 int 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 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) );
        }
                if ( close != std::string::npos )
                        tmp+=str.substr( open+2, close-(open+2) );
        }


@@ -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;