EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix of the fix

Browse Source
This commit is contained in:
zimoch
2018-08-21 10:43:13 +02:00
parent 047f18d113
commit 1d753366d8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/StreamEpics.cc
View File

@ -720,7 +720,7 @@ parseLink(const struct link *ioLink, char* filename,
if (0 >= sscanf(ioLink->value.instio.string+n1, " %[^ \t(] %n", protocol, &n2)) if (0 >= sscanf(ioLink->value.instio.string+n1, " %[^ \t(] %n", protocol, &n2))
{ {
error("%s: Missing protocol name\n" error("%s: Missing protocol name\n"
" expect \"@file protocol[(args)] bus [addr] [params]\"\n" " expect \"@file protocol[(arg1,...)] bus [addr] [params]\"\n"
" in \"@%s\"\n", name(), " in \"@%s\"\n", name(),
ioLink->value.instio.string); ioLink->value.instio.string);
return S_dev_badInitRet; return S_dev_badInitRet;
@ -728,14 +728,14 @@ parseLink(const struct link *ioLink, char* filename,
n1+=n2; n1+=n2;
if (ioLink->value.instio.string[n1] == '(') if (ioLink->value.instio.string[n1] == '(')
{ {
strcat(protocol, "("); n2 = 0;
sscanf(ioLink->value.instio.string+n1, " %[^)] %n", protocol+strlen(protocol), &n2); sscanf(ioLink->value.instio.string+n1, " %[^)] %n", protocol+strlen(protocol), &n2);
n1+=n2; n1+=n2;
if (ioLink->value.instio.string[n1++] != ')') if (ioLink->value.instio.string[n1++] != ')')
{ {
error("%s: Missing ')' after protocol '%s': '%s'\n" error("%s: Missing ')' after protocol arguments '%s'\n"
" expect \"@file protocol[(args)] bus [addr] [params]\"\n" " expect \"@file protocol(arg1,...) bus [addr] [params]\"\n"
" in \"@%s\"\n", name(), protocol, ioLink->value.instio.string+n1-1, " in \"@%s\"\n", name(), protocol,
ioLink->value.instio.string); ioLink->value.instio.string);
return S_dev_badInitRet; return S_dev_badInitRet;
} }
@ -744,7 +744,7 @@ parseLink(const struct link *ioLink, char* filename,
if (0 >= sscanf(ioLink->value.instio.string+n1, "%s %i %99c", busname, addr, busparam)) if (0 >= sscanf(ioLink->value.instio.string+n1, "%s %i %99c", busname, addr, busparam))
{ {
error("%s: Missing bus name\n" error("%s: Missing bus name\n"
" expect \"@file protocol[(args)] bus [addr] [params]\"\n" " expect \"@file protocol[(arg1,...)] bus [addr] [params]\"\n"
" in \"@%s\"\n", name(), " in \"@%s\"\n", name(),
ioLink->value.instio.string); ioLink->value.instio.string);
return S_dev_badInitRet; return S_dev_badInitRet;