aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/dvb/epgcache.cpp4
-rw-r--r--lib/dvb/esection.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 9c2849b1..4359ff55 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -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() )
diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 88c652a0..d7fd728a 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -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)",