From a188374983ec285819d1c2d7b04e5fc25cb1fea0 Mon Sep 17 00:00:00 2001
From: Karl Dietz <dekarl@mythtv.org>
Date: Sat, 15 Dec 2012 00:32:34 +0100
Subject: [PATCH] store chanid as unsigned int in EITScanner

---
 mythtv/libs/libmythtv/eitcache.cpp  | 6 +++---
 mythtv/libs/libmythtv/eithelper.cpp | 6 +++---
 mythtv/libs/libmythtv/eithelper.h   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mythtv/libs/libmythtv/eitcache.cpp b/mythtv/libs/libmythtv/eitcache.cpp
index d42dacd9b26..79ec79626a7 100644
--- a/mythtv/libs/libmythtv/eitcache.cpp
+++ b/mythtv/libs/libmythtv/eitcache.cpp
@@ -84,7 +84,7 @@ static inline bool modified(uint64_t sig)
     return sig >> 63;
 }
 
-static void replace_in_db(int chanid, uint eventid, uint64_t sig)
+static void replace_in_db(uint chanid, uint eventid, uint64_t sig)
 {
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -129,7 +129,7 @@ static void delete_in_db(uint endtime)
 #define CHANNEL_LOCK 1
 #define STATISTIC    2
 
-static bool lock_channel(int chanid, uint lastPruneTime)
+static bool lock_channel(uint chanid, uint lastPruneTime)
 {
     int lock = 1;
     MSqlQuery query(MSqlQuery::InitCon());
@@ -183,7 +183,7 @@ static bool lock_channel(int chanid, uint lastPruneTime)
     return true;
 }
 
-static void unlock_channel(int chanid, uint updated)
+static void unlock_channel(uint chanid, uint updated)
 {
     MSqlQuery query(MSqlQuery::InitCon());
 
diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
index bd4d7933710..ff8dd24e01b 100644
--- a/mythtv/libs/libmythtv/eithelper.cpp
+++ b/mythtv/libs/libmythtv/eithelper.cpp
@@ -673,7 +673,7 @@ uint EITHelper::GetChanID(uint atsc_major, uint atsc_minor)
 
     ServiceToChanID::const_iterator it = srv_to_chanid.find(key);
     if (it != srv_to_chanid.end())
-        return max(*it, 0);
+        return max(*it, 0u);
 
     uint chanid = get_chan_id_from_db_atsc(sourceid, atsc_major, atsc_minor);
     srv_to_chanid[key] = chanid;
@@ -691,7 +691,7 @@ uint EITHelper::GetChanID(uint serviceid, uint networkid, uint tsid)
 
     ServiceToChanID::const_iterator it = srv_to_chanid.find(key);
     if (it != srv_to_chanid.end())
-        return max(*it, 0);
+        return max(*it, 0u);
 
     uint chanid = get_chan_id_from_db_dvb(sourceid, serviceid, networkid, tsid);
     srv_to_chanid[key] = chanid;
@@ -708,7 +708,7 @@ uint EITHelper::GetChanID(uint program_number)
 
     ServiceToChanID::const_iterator it = srv_to_chanid.find(key);
     if (it != srv_to_chanid.end())
-        return max(*it, 0);
+        return max(*it, 0u);
 
     uint chanid = get_chan_id_from_db_dtv(sourceid, program_number, channelid);
     srv_to_chanid[key] = chanid;
diff --git a/mythtv/libs/libmythtv/eithelper.h b/mythtv/libs/libmythtv/eithelper.h
index 9b4af1c0f90..1cc00b809a8 100644
--- a/mythtv/libs/libmythtv/eithelper.h
+++ b/mythtv/libs/libmythtv/eithelper.h
@@ -44,7 +44,7 @@ typedef QMap<uint,ATSCEvent>               EventIDToATSCEvent;
 typedef QMap<uint,QString>                 EventIDToETT;
 typedef QMap<uint,EventIDToATSCEvent>      ATSCSRCToEvents;
 typedef QMap<uint,EventIDToETT>            ATSCSRCToETTs;
-typedef QMap<unsigned long long,int>       ServiceToChanID;
+typedef QMap<unsigned long long,uint>      ServiceToChanID;
 
 class DBEventEIT;
 class EITFixUp;