Compare commits
4 Commits
stream_2_7
...
2-7
Author | SHA1 | Date | |
---|---|---|---|
d5dc15e321 | |||
cfa777d718 | |||
54bc78f7c7 | |||
77d110de70 |
@ -741,16 +741,15 @@ process()
|
|||||||
debug("Stream::process(%s) start\n", name());
|
debug("Stream::process(%s) start\n", name());
|
||||||
status = NO_ALARM;
|
status = NO_ALARM;
|
||||||
convert = OK;
|
convert = OK;
|
||||||
record->pact = true;
|
|
||||||
if (!startProtocol(StreamCore::StartNormal))
|
if (!startProtocol(StreamCore::StartNormal))
|
||||||
{
|
{
|
||||||
debug("Stream::process(%s): could not start, status=%d\n",
|
debug("Stream::process(%s): could not start, status=%d\n",
|
||||||
name(), status);
|
name(), status);
|
||||||
(void) recGblSetSevr(record, status, INVALID_ALARM);
|
(void) recGblSetSevr(record, status, INVALID_ALARM);
|
||||||
record->pact = false;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
debug("Stream::process(%s): protocol started\n", name());
|
debug("Stream::process(%s): protocol started\n", name());
|
||||||
|
record->pact = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1359,7 +1359,8 @@ compileString(StreamBuffer& buffer, const char*& source,
|
|||||||
source);
|
source);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (formatType != NoFormat)
|
if (formatType != NoFormat &&
|
||||||
|
i > 2 /* do not escape skip */)
|
||||||
{
|
{
|
||||||
buffer.append(esc);
|
buffer.append(esc);
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#define STREAM_MAJOR 2
|
#define STREAM_MAJOR 2
|
||||||
#define STREAM_MINOR 7
|
#define STREAM_MINOR 7
|
||||||
#define STREAM_PATCHLEVEL 13
|
#define STREAM_PATCHLEVEL 14
|
||||||
|
|
||||||
#if defined(__vxworks) || defined(vxWorks)
|
#if defined(__vxworks) || defined(vxWorks)
|
||||||
#include <vxWorks.h>
|
#include <vxWorks.h>
|
||||||
|
@ -192,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
|
|||||||
return ERROR;
|
return ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DBF_ULONG:
|
||||||
case DBF_LONG:
|
case DBF_LONG:
|
||||||
case DBF_ENUM:
|
case DBF_ENUM:
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user