summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-13 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-13 18:00:00 +0200
commitd07e3829f7c44d713b2677ef73f864af80b3dea3 (patch)
tree8d6d89b303900b502ec52e83e408795a5728db52 /config.c
parent803c6c6bf6340302f78171892bef599aa272c266 (diff)
downloadvdr-patch-lnbsharing-d07e3829f7c44d713b2677ef73f864af80b3dea3.tar.gz
vdr-patch-lnbsharing-d07e3829f7c44d713b2677ef73f864af80b3dea3.tar.bz2
Version 1.1.2vdr-1.1.2
- Changed the cPlugin::Start() function to return a boolean value that indicates if the plugin will not be able to perform its task (suggested by Stefan Huelswitt). - Added the cPlugin::Housekeeping() function (suggested by Stefan Huelswitt). - Updated channels.conf.cable (thanks to Uwe Scheffler). - Added 'insert' capabilities to cList (suggested by Stefan Huelswitt). - Changed the 'package' target in the plugin's Makefile to produce a package that expands to a directory with just the plugin name and version number (suggested by Stefan Huelswitt). - Made the config directory available to plugins (suggested by Stefan Huelswitt). See PLUGINS.html, section "Configuration files" for details. - Improved the [eid]syslog() macros, so that the LOG_... macros don't need to be given any more.
Diffstat (limited to 'config.c')
-rw-r--r--config.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/config.c b/config.c
index eeb96eb..f28d1a5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.100 2002/05/11 12:05:22 kls Exp $
+ * $Id: config.c 1.101 2002/05/13 16:28:12 kls Exp $
*/
#include "config.h"
@@ -72,7 +72,7 @@ void cKeys::SetDummyValues(void)
bool cKeys::Load(const char *FileName)
{
- isyslog(LOG_INFO, "loading %s", FileName);
+ isyslog("loading %s", FileName);
bool result = false;
if (FileName)
fileName = strdup(FileName);
@@ -105,7 +105,7 @@ bool cKeys::Load(const char *FileName)
}
}
if (Name) {
- esyslog(LOG_ERR, "unknown key in %s, line %d\n", fileName, line);
+ esyslog("unknown key in %s, line %d\n", fileName, line);
result = false;
break;
}
@@ -113,7 +113,7 @@ bool cKeys::Load(const char *FileName)
}
continue;
}
- esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+ esyslog("error in %s, line %d\n", fileName, line);
result = false;
break;
}
@@ -121,10 +121,10 @@ bool cKeys::Load(const char *FileName)
fclose(f);
}
else
- esyslog(LOG_ERR, "can't open '%s'\n", fileName);
+ esyslog("can't open '%s'\n", fileName);
}
else
- esyslog(LOG_ERR, "no key configuration file name supplied!\n");
+ esyslog("no key configuration file name supplied!\n");
return result;
}
@@ -299,7 +299,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
DvbApi = cDvbApi::PrimaryDvbApi;
if (!DvbApi->Recording() && !groupSep) {
if (Log)
- isyslog(LOG_INFO, "switching to channel %d", number);
+ isyslog("switching to channel %d", number);
for (int i = 3; i--;) {
switch (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr)) {
case scrOk: return true;
@@ -308,7 +308,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
return false;
case scrFailed: break; // loop will retry
}
- esyslog(LOG_ERR, "retrying");
+ esyslog("retrying");
}
return false;
}
@@ -637,7 +637,7 @@ time_t cTimer::StopTime(void)
void cTimer::SetRecording(bool Recording)
{
recording = Recording;
- isyslog(LOG_INFO, "timer %d %s", Index() + 1, recording ? "start" : "stop");
+ isyslog("timer %d %s", Index() + 1, recording ? "start" : "stop");
}
void cTimer::SetPending(bool Pending)
@@ -684,7 +684,7 @@ bool cCommand::Parse(const char *s)
const char *cCommand::Execute(void)
{
- dsyslog(LOG_INFO, "executing command '%s'", command);
+ dsyslog("executing command '%s'", command);
delete result;
result = NULL;
FILE *p = popen(command, "r");
@@ -701,7 +701,7 @@ const char *cCommand::Execute(void)
pclose(p);
}
else
- esyslog(LOG_ERR, "ERROR: can't open pipe for command '%s'", command);
+ esyslog("ERROR: can't open pipe for command '%s'", command);
return result;
}
@@ -1084,7 +1084,7 @@ bool cSetup::Load(const char *FileName)
error = true;
}
if (error) {
- esyslog(LOG_ERR, "ERROR: unknown config parameter: %s%s%s = %s", l->Plugin() ? l->Plugin() : "", l->Plugin() ? "." : "", l->Name(), l->Value());
+ esyslog("ERROR: unknown config parameter: %s%s%s = %s", l->Plugin() ? l->Plugin() : "", l->Plugin() ? "." : "", l->Name(), l->Value());
result = false;
}
}
@@ -1225,7 +1225,7 @@ bool cSetup::Save(void)
Sort();
if (cConfig<cSetupLine>::Save()) {
- isyslog(LOG_INFO, "saved setup to %s", FileName());
+ isyslog("saved setup to %s", FileName());
return true;
}
return false;