[vdr] Re: Formally correct output patch for scan

[Reinhard Nissl <rnissl@gmx.de>]

Hi,

Klaus Schmidinger wrote:

> > > @Klaus: Any particular changes for upcoming mythical beast
> > > to be considered for channels.conf format.
> > When the name of a channel contains a ':', replace it with a '|', to not break
> > the file format (':' is the column separator).
> >
> > @Klaus: Do you substitute '|' back to ':' again? The channel OSD still shows
> > me a '|'. Maybe, it depends on NID, TID usage, because scan supplied them in
> > my case.
> Can you please test this:
Works, but shouldn't the variable "ok" be returned at the end of the function?

> --- channels.c  2003/08/16 09:12:26     1.13
> +++ channels.c  2003/09/09 16:23:02
> @@ -315,6 +315,7 @@
>  
>  bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
>  {
> +  bool ok = true;
>    if (*s == ':') {
>       groupSep = true;
>       if (*++s == '@' && *++s) {
> @@ -346,7 +347,7 @@
>          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,7 +373,6 @@
>             esyslog("ERROR: channel data not unique!");
>             return false;
>             }
> -        return ok;
>          }
>       else
>          return false;
>
>
> Klaus
Bye.
--
Dipl.-Inform. (FH) Reinhard Nissl
mailto:rnissl@gmx.de



--
Info:
To unsubscribe send a mail to ecartis@linuxtv.org with "unsubscribe vdr" as subject.