X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5b5fab0065f7b922b03b66d5b40e680a1960d1ca..6cb24cbdb6455f4425970c8dc4657318d64e63b2:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 2bc2d75e..03c51212 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -323,7 +323,7 @@ void eDVBDB::reloadServicelist()
 					system=eDVBFrontendParametersSatellite::System::DVB_S,
 					modulation=eDVBFrontendParametersSatellite::Modulation::QPSK,
 					rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto;
-				sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff);
+				sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff);
 				sat.frequency = frequency;
 				sat.symbol_rate = symbol_rate;
 				sat.polarisation = polarisation;
@@ -339,7 +339,7 @@ void eDVBDB::reloadServicelist()
 			{
 				eDVBFrontendParametersTerrestrial ter;
 				int frequency, bandwidth, code_rate_HP, code_rate_LP, modulation, transmission_mode, guard_interval, hierarchy, inversion;
-				sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &bandwidth, &code_rate_HP, &code_rate_LP, &modulation, &transmission_mode, &guard_interval, &hierarchy, &inversion);
+				sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &bandwidth, &code_rate_HP, &code_rate_LP, &modulation, &transmission_mode, &guard_interval, &hierarchy, &inversion);
 				ter.frequency = frequency;
 				ter.bandwidth = bandwidth;
 				ter.code_rate_HP = code_rate_HP;
@@ -357,7 +357,7 @@ void eDVBDB::reloadServicelist()
 					inversion=eDVBFrontendParametersCable::Inversion::Unknown,
 					modulation=eDVBFrontendParametersCable::Modulation::Auto,
 					fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
-				sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+				sscanf(line+3, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
 				cab.frequency = frequency;
 				cab.fec_inner = fec_inner;
 				cab.inversion = inversion;
@@ -417,7 +417,7 @@ void eDVBDB::reloadServicelist()
 		} else
 			while ((!str.empty()) && str[1]==':') // new: p:, f:, c:%02d...
 			{
-				unsigned int c=str.find(',');
+				size_t c=str.find(',');
 				char p=str[0];
 				std::string v;
 				if (c == std::string::npos)
@@ -497,14 +497,14 @@ void eDVBDB::saveServicelist()
 					sat.inversion);
 			}
 		}
-		if (!ch.m_frontendParameters->getDVBT(ter))
+		else if (!ch.m_frontendParameters->getDVBT(ter))
 		{
 			fprintf(f, "\tt %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
 				ter.frequency, ter.bandwidth, ter.code_rate_HP,
 				ter.code_rate_LP, ter.modulation, ter.transmission_mode,
 				ter.guard_interval, ter.hierarchy, ter.inversion);
 		}
-		if (!ch.m_frontendParameters->getDVBC(cab))
+		else if (!ch.m_frontendParameters->getDVBC(cab))
 		{
 			fprintf(f, "\tc %d:%d:%d:%d:%d\n",
 				cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
@@ -560,7 +560,7 @@ void eDVBDB::loadBouquet(const char *path)
 		eDebug("Bouquet load failed.. no path given..");
 		return;
 	}
-	unsigned int pos = bouquet_name.rfind('/');
+	size_t pos = bouquet_name.rfind('/');
 	if ( pos != std::string::npos )
 		bouquet_name.erase(0, pos+1);
 	if (bouquet_name.empty())
@@ -627,7 +627,7 @@ void eDVBDB::loadBouquet(const char *path)
 				}
 				if ( tmp.flags&eServiceReference::canDescent )
 				{
-					unsigned int pos = tmp.path.rfind('/');
+					size_t pos = tmp.path.rfind('/');
 					char buf[256];
 					std::string path = tmp.path;
 					if ( pos != std::string::npos )
@@ -760,7 +760,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 		Py_INCREF(Py_False);
 		return Py_False;
 	}
-	int tmp, *dest,
+	int tmp, *dest = NULL,
 		modulation, system, freq, sr, pol, fec;
 	char *end_ptr;
 	const Attribute *at;
@@ -863,6 +863,8 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				Py_DECREF(sat_pos);
 			if (sat_name)
 				Py_DECREF(sat_name);
+			if (sat_flags)
+				Py_DECREF(sat_flags);
 		}
 	}
 	Py_INCREF(Py_True);
@@ -1335,7 +1337,7 @@ RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
 		eDebug("getBouquet failed.. no path given!");
 		return -1;
 	}
-	unsigned int pos = str.find("FROM BOUQUET \"");
+	size_t pos = str.find("FROM BOUQUET \"");
 	if ( pos != std::string::npos )
 	{
 		str.erase(0, pos+14);