Merge branch 'shadowguy-master'

docs/index.html

@@ -96,11 +96,11 @@ come in a predictible order to be parsable by <em>StreamDevice</em>.
 <h2>Recommended Readings</h2>
 <p>
 IOC Application Developer's Guide:
-<a href="https://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide"
+<a href="https://epics.anl.gov/base/R3-14/12-docs/AppDevGuide/"
 target="ex">R3.14.12</a>,
-<a href="https://www.aps.anl.gov/epics/base/R3-16/1-docs/AppDevGuide"
+<a href="https://epics.anl.gov/base/R3-15/5-docs/AppDevGuide/AppDevGuide.html"
 target="ex">R3.15.5</a>,
-<a href="https://www.aps.anl.gov/epics/base/R3-15/5-docs/AppDevGuide"
+<a href="https://epics.anl.gov/base/R3-16/1-docs/AppDevGuide/AppDevGuide.html"
 target="ex">R3.16.1</a>
 </p>
 <p>

docs/setup.html

@@ -388,7 +388,7 @@ The <code>INP</code> or <code>OUT</code> link has the form
 <code>"@<var>filename&nbsp;protocol</var>[(<var>arg1</var>,<var>arg2</var>,...)]&nbsp;</var>bus</var>&nbsp;[<var>address</var>&nbsp;[<var>parameters</var>]]"</code>.
 </p>
 <p>
-(Elements in <code>[]</code> are optional. To not type the <code>[]</code>).
+(Elements in <code>[]</code> are optional. Do not type the <code>[]</code>).
 </p>
 <p>
 Here, <code><var>filename</var></code> is the name of the protocol file and

src/StreamEpics.cc

@@ -720,7 +720,7 @@ parseLink(const struct link *ioLink, char* filename,
     if (0 >= sscanf(ioLink->value.instio.string+n1, " %[^ \t(] %n", protocol, &n2))
     {
         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(),
             ioLink->value.instio.string);
         return S_dev_badInitRet;
@@ -728,15 +728,14 @@ parseLink(const struct link *ioLink, char* filename,
     n1+=n2;
     if (ioLink->value.instio.string[n1] == '(')
     {
-        strcat(protocol, "(");
+        n2 = 0;
-        n1++;
         sscanf(ioLink->value.instio.string+n1, " %[^)] %n", protocol+strlen(protocol), &n2);
         n1+=n2;
         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);
             return S_dev_badInitRet;
         }
@@ -745,7 +744,7 @@ parseLink(const struct link *ioLink, char* filename,
     if (0 >= sscanf(ioLink->value.instio.string+n1, "%s %i %99c", busname, addr, busparam))
     {
         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(),
             ioLink->value.instio.string);
         return S_dev_badInitRet;