break;
if (line[0]=='#')
{
- if (!strncmp(line, "#SERVICE ", 9) || !strncmp(line, "#SERVICE: ", 10))
+ if (!strncmp(line, "#SERVICE", 8))
{
int offs = line[8] == ':' ? 10 : 9;
eServiceReference tmp(line+offs);
read_descr=true;
++entries;
}
- else if (read_descr && !strncmp(line, "#DESCRIPTION ", 13))
+ else if (read_descr && !strncmp(line, "#DESCRIPTION", 12))
{
- e->name = line+13;
+ int offs = line[12] == ':' ? 14 : 13;
+ e->name = line+offs;
read_descr=false;
}
- else if (!strncmp(line, "#NAME ", 6))
- bouquet.m_bouquet_name=line+6;
+ else if (!strncmp(line, "#NAME ", 6) || !strncmp(line, "#NAME: ", 7))
+ {
+ int offs = line[5] == ':' ? 7 : 6;
+ bouquet.m_bouquet_name=line+offs;
+ }
continue;
}
}