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 (from parent 1:
d23552e
)
db: remove recursive loading of lamedb
author
Andreas Oberritter
<obi@opendreambox.org>
Fri, 25 Mar 2011 15:30:22 +0000
(16:30 +0100)
committer
Andreas Oberritter
<obi@opendreambox.org>
Tue, 29 Mar 2011 13:43:58 +0000
(15:43 +0200)
lib/dvb/db.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index 522035eb7585b751c0f22bf6ac117ea0bdc03ed9..ccaecd4f682798d62fc9315d0f923934aa863d3c 100644
(file)
--- 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");
{
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;
}
return;
}
+
char line[256];
int version=3;
if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)
char line[256];
int version=3;
if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)