git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ae68fe
)
lib/dvb/db.cpp: skip unknown attributes in satellites/cables/terrestrial.xml
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 20 May 2009 14:32:57 +0000
(16:32 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 20 May 2009 14:32:57 +0000
(16:32 +0200)
lib/dvb/db.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index ae30e3604507a72df50b20b8aeeda9770dbdb2a1..cabc56d9301a9c5df4ac9ed74c5c61d7e376e483 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-872,6
+872,7
@@
PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
else if (name == "pilot") dest = &pilot;
else if (name == "tsid") dest = &tsid;
else if (name == "onid") dest = &onid;
else if (name == "pilot") dest = &pilot;
else if (name == "tsid") dest = &tsid;
else if (name == "onid") dest = &onid;
+ else continue;
if (dest)
{
//eDebug("\t\t\tvalue: %s", at->value().c_str());
if (dest)
{
//eDebug("\t\t\tvalue: %s", at->value().c_str());
@@
-998,6
+999,7
@@
PyObject *eDVBDB::readCables(ePyObject cab_list, ePyObject tp_dict)
else if (name == "frequency") dest = &freq;
else if (name == "symbol_rate") dest = &sr;
else if (name == "fec_inner") dest = &fec;
else if (name == "frequency") dest = &freq;
else if (name == "symbol_rate") dest = &sr;
else if (name == "fec_inner") dest = &fec;
+ else continue;
if (dest)
{
tmp = strtol(at->value().c_str(), &end_ptr, 10);
if (dest)
{
tmp = strtol(at->value().c_str(), &end_ptr, 10);
@@
-1121,6
+1123,7
@@
PyObject *eDVBDB::readTerrestrials(ePyObject ter_list, ePyObject tp_dict)
else if (name == "transmission_mode") dest = &transm;
else if (name == "hierarchy_information") dest = &hierarchy;
else if (name == "inversion") dest = &inv;
else if (name == "transmission_mode") dest = &transm;
else if (name == "hierarchy_information") dest = &hierarchy;
else if (name == "inversion") dest = &inv;
+ else continue;
if (dest)
{
tmp = strtol(at->value().c_str(), &end_ptr, 10);
if (dest)
{
tmp = strtol(at->value().c_str(), &end_ptr, 10);