summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-09-09 18:55:26 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-09-09 18:55:26 +0200
commita4c7d7b8a74cd8ab7296113e47d341fa1addbf69 (patch)
tree54874bae370f6c2ce780a7e8a16adc8f0b5b8fe7 /channels.c
parent19efbe45031cc5015e92d5dbffb018cf0cbcbd8d (diff)
downloadvdr-a4c7d7b8a74cd8ab7296113e47d341fa1addbf69.tar.gz
vdr-a4c7d7b8a74cd8ab7296113e47d341fa1addbf69.tar.bz2
Fixed handling ':' characters in channel names when reading channels.conf
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/channels.c b/channels.c
index 58577296..6ff71888 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 1.13 2003/08/16 09:12:26 kls Exp $
+ * $Id: channels.c 1.14 2003/09/09 18:55:26 kls Exp $
*/
#include "channels.h"
@@ -315,6 +315,7 @@ const char *cChannel::ToText(void)
bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
{
+ bool ok = true;
if (*s == ':') {
groupSep = true;
if (*++s == '@' && *++s) {
@@ -346,7 +347,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
vpid = ppid = 0;
apid1 = apid2 = 0;
dpid1 = dpid2 = 0;
- bool ok = false;
+ ok = false;
if (parambuf && sourcebuf && vpidbuf && apidbuf) {
ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
char *p = strchr(vpidbuf, '+');
@@ -372,13 +373,12 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
esyslog("ERROR: channel data not unique!");
return false;
}
- return ok;
}
else
return false;
}
strreplace(name, '|', ':');
- return true;
+ return ok;
}
bool cChannel::Save(FILE *f)