small fix
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 24 Nov 2006 20:23:15 +0000 (20:23 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 24 Nov 2006 20:23:15 +0000 (20:23 +0000)
lib/dvb/epgcache.cpp
lib/dvb/esection.h

index 9c2849b1bc714c4bb739233f99fd1ea8531ebd55..4359ff55811fe2e6c4ea42c6a31fe4bd662958ba 100644 (file)
@@ -2899,9 +2899,7 @@ void eEPGCache::channel_data::readMHWData(const __u8 *data)
                int len = ((data[1]&0xf)<<8) + data[2];
 
                // ugly workaround to convert const __u8* to char*
-               char *tmp=0;
-               memcpy(&tmp, &data, sizeof(void*));
-               tmp[len+3] = 0; // Terminate as a string.
+               ((char*)&data)[len+3] = 0;      // Terminate as a string.
 
                std::map<__u32, __u32>::iterator itProgid( m_program_ids.find( program_id ) );
                if ( itProgid == m_program_ids.end() )
index 88c652a0ef0f525e8ff101a916312f52ea22cffe..d7fd728a2b3ad50e23723a7272218e5125bb584a 100644 (file)
@@ -40,7 +40,7 @@ private:
 protected:
        int createTable(int nr, const __u8 *data, unsigned int max)
        {
-               int ssize = sections.size();
+               unsigned int ssize = sections.size();
                if (max < ssize || nr >= max)
                {
                        eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",