From f45ad930a1f328f880def7e4caa5f48e76c3392f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 25 Mar 2011 16:30:22 +0100 Subject: [PATCH 1/1] db: remove recursive loading of lamedb --- lib/dvb/db.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index 522035eb..ccaecd4f 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -325,19 +325,11 @@ void eDVBDB::loadServicelist(const char *file) { eDebug("---- opening lame channel db"); FILE *f=fopen(file, "rt"); - if (!f && strcmp(file, eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()) == 0) - { - struct stat s; - if ( !stat("lamedb", &s) ) - { - if ( !stat(eEnv::resolve("${sysconfdir}/enigma2").c_str(), &s) ) - { - rename("lamedb", eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()); - reloadServicelist(); - } - } + if (!f) { + eDebug("can't open %s: %m", file); return; } + char line[256]; int version=3; if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1) -- 2.30.2