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

Merge branch 'master' into cleanup_for_windows

Browse Source
This commit is contained in:
zimoch
2018-03-13 14:07:39 +01:00
parent b77ca836b2 76115ae959
commit f0a1839548
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StreamBuffer.cc
View File

@ -314,7 +314,7 @@ dump() const
StreamBuffer result(256+cap*5); StreamBuffer result(256+cap*5);
result.append("\033[0m"); result.append("\033[0m");
size_t i; size_t i;
result.print("%"P"d,%"P"d,%"P"d:\033[37m", offs, len, cap); result.print("%" P "d,%" P "d,%" P "d:\033[37m", offs, len, cap);
for (i = 0; i < cap; i++) for (i = 0; i < cap; i++)
{ {
if (i == offs) result.append("\033[34m[\033[0m"); if (i == offs) result.append("\033[34m[\033[0m");

4
src/StreamCore.cc
View File

@ -997,7 +997,7 @@ readCallback(StreamIoStatus status,
finishProtocol(ReplyTimeout); finishProtocol(ReplyTimeout);
return 0; return 0;
case StreamIoFault: case StreamIoFault:
error("%s: I/O error after reading %"P"d byte%s: \"%s%s\"\n", error("%s: I/O error after reading %" P "d byte%s: \"%s%s\"\n",
name(), name(),
inputBuffer.length(), inputBuffer.length()==1 ? "" : "s", inputBuffer.length(), inputBuffer.length()==1 ? "" : "s",
inputBuffer.length() > 20 ? "..." : "", inputBuffer.length() > 20 ? "..." : "",
@ -1006,7 +1006,7 @@ readCallback(StreamIoStatus status,
return 0; return 0;
} }
inputBuffer.append(input, size); inputBuffer.append(input, size);
debug("StreamCore::readCallback(%s) inputBuffer=\"%s\", size %"P"d\n", debug("StreamCore::readCallback(%s) inputBuffer=\"%s\", size %" P "d\n",
name(), inputBuffer.expand()(), inputBuffer.length()); name(), inputBuffer.expand()(), inputBuffer.length());
if (*activeCommand != in_cmd) if (*activeCommand != in_cmd)
{ {

2
src/StreamEpics.cc
View File

@ -1119,7 +1119,7 @@ bool Stream::
matchValue(const StreamFormat& format, const void* fieldaddress) matchValue(const StreamFormat& format, const void* fieldaddress)
{ {
// this function must increase consumedInput // this function must increase consumedInput
long consumed; long consumed = 0;
long lval; long lval;
double dval; double dval;
char* buffer; char* buffer;