From 1a2572289b607810dfc4a91970a4576034c2e58a Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Jan 2007 21:44:43 +0000
Subject: [PATCH 1/1] remove changes without any effect

---
 lib/dvb/epgcache.cpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index c412fd59..afbc6e01 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -46,7 +46,6 @@ const eServiceReference &handleGroup(const eServiceReference &ref)
 	return ref;
 }
 
-
 eventData::eventData(const eit_event_struct* e, int size, int type)
 	:ByteSize(size&0xFF), type(type&0xFF)
 {
@@ -564,29 +563,25 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 #endif
 			if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
 			{
-				eventData *tmp1 = ev_it->second,
-						*tmp2 = tm_it->second;
+				// exempt memory
+				delete ev_it->second;
+				delete tm_it->second;
 				ev_it->second=evt;
 				tm_it->second=evt;
-				// exempt memory
-				delete tmp1;
-				delete tmp2;
 			}
 			else if (ev_erase_count == 0 && tm_erase_count > 0)
 			{
-				eventData *tmp = ev_it->second;
+				// exempt memory
+				delete ev_it->second;
 				tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
 				ev_it->second=evt;
-				// exempt memory
-				delete tmp;
 			}
 			else if (ev_erase_count > 0 && tm_erase_count == 0)
 			{
-				eventData *tmp = tm_it->second;
+				// exempt memory
+				delete tm_it->second;
 				ev_it=prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
 				tm_it->second=evt;
-				// exempt memory
-				delete tmp;
 			}
 			else // added new eventData
 			{
-- 
2.30.2