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

obsolete separator function removed

Browse Source
This commit is contained in:
zimoch
2010-11-29 15:24:18 +00:00
parent 1af9c6ea55
commit 7836af6423
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/StreamCore.h
View File

@ -139,7 +139,6 @@ protected:
long scanValue(const StreamFormat& format, double& value); long scanValue(const StreamFormat& format, double& value);
long scanValue(const StreamFormat& format, char* value, long maxlen); long scanValue(const StreamFormat& format, char* value, long maxlen);
long scanValue(const StreamFormat& format); long scanValue(const StreamFormat& format);
bool scanSeparator(); // disencouraged
StreamBuffer protocolname; StreamBuffer protocolname;
unsigned long lockTimeout; unsigned long lockTimeout;

10
src/StreamEpics.cc
View File

@ -156,7 +156,6 @@ class Stream : protected StreamCore
friend long streamPrintf(dbCommon *record, format_t *format, ...); friend long streamPrintf(dbCommon *record, format_t *format, ...);
friend long streamScanfN(dbCommon *record, format_t *format, friend long streamScanfN(dbCommon *record, format_t *format,
void*, size_t maxStringSize); void*, size_t maxStringSize);
friend long streamScanSep(dbCommon *record);
friend long streamReload(char* recordname); friend long streamReload(char* recordname);
public: public:
@ -488,15 +487,6 @@ long streamPrintf(dbCommon *record, format_t *format, ...)
return success ? OK : ERROR; return success ? OK : ERROR;
} }
long streamScanSep(dbCommon* record)
{
// depreciated
debug("streamScanSep(%s)\n", record->name);
Stream* pstream = (Stream*)record->dpvt;
if (!pstream) return ERROR;
return pstream->scanSeparator() ? OK : ERROR;
}
long streamScanfN(dbCommon* record, format_t *format, long streamScanfN(dbCommon* record, format_t *format,
void* value, size_t maxStringSize) void* value, size_t maxStringSize)
{ {

3
src/devStream.h
View File

@ -85,7 +85,6 @@ long streamReport(int interest);
long streamReadWrite(dbCommon *record); long streamReadWrite(dbCommon *record);
long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt); long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt);
long streamPrintf(dbCommon *record, format_t *format, ...); long streamPrintf(dbCommon *record, format_t *format, ...);
long streamScanSep(dbCommon *record);
long streamScanfN(dbCommon *record, format_t *format, long streamScanfN(dbCommon *record, format_t *format,
void*, size_t maxStringSize); void*, size_t maxStringSize);
@ -99,7 +98,7 @@ long streamScanfN(dbCommon *record, format_t *format,
#define devStreamGetIointInfo streamGetIointInfo #define devStreamGetIointInfo streamGetIointInfo
#define devStreamPrintf streamPrintf #define devStreamPrintf streamPrintf
#define devStreamPrintSep(record) (0) #define devStreamPrintSep(record) (0)
#define devStreamScanSep streamScanSep #define devStreamScanSep (0)
#define devStreamScanf(record, format, value) \ #define devStreamScanf(record, format, value) \
streamScanfN(record, format, value, MAX_STRING_SIZE) streamScanfN(record, format, value, MAX_STRING_SIZE)
#define streamScanf(record, format, value) \ #define streamScanf(record, format, value) \