From 7836af64233db61c24f661f0ea1e66c8420474c3 Mon Sep 17 00:00:00 2001 From: zimoch Date: Mon, 29 Nov 2010 15:24:18 +0000 Subject: [PATCH] obsolete separator function removed --- src/StreamCore.h | 1 - src/StreamEpics.cc | 10 ---------- src/devStream.h | 3 +-- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/StreamCore.h b/src/StreamCore.h index a347ca7..2a2f3ff 100644 --- a/src/StreamCore.h +++ b/src/StreamCore.h @@ -139,7 +139,6 @@ protected: long scanValue(const StreamFormat& format, double& value); long scanValue(const StreamFormat& format, char* value, long maxlen); long scanValue(const StreamFormat& format); - bool scanSeparator(); // disencouraged StreamBuffer protocolname; unsigned long lockTimeout; diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 48a2fc1..968601a 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -156,7 +156,6 @@ class Stream : protected StreamCore friend long streamPrintf(dbCommon *record, format_t *format, ...); friend long streamScanfN(dbCommon *record, format_t *format, void*, size_t maxStringSize); - friend long streamScanSep(dbCommon *record); friend long streamReload(char* recordname); public: @@ -488,15 +487,6 @@ long streamPrintf(dbCommon *record, format_t *format, ...) 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, void* value, size_t maxStringSize) { diff --git a/src/devStream.h b/src/devStream.h index da5dd92..90f771c 100644 --- a/src/devStream.h +++ b/src/devStream.h @@ -85,7 +85,6 @@ long streamReport(int interest); long streamReadWrite(dbCommon *record); long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt); long streamPrintf(dbCommon *record, format_t *format, ...); -long streamScanSep(dbCommon *record); long streamScanfN(dbCommon *record, format_t *format, void*, size_t maxStringSize); @@ -99,7 +98,7 @@ long streamScanfN(dbCommon *record, format_t *format, #define devStreamGetIointInfo streamGetIointInfo #define devStreamPrintf streamPrintf #define devStreamPrintSep(record) (0) -#define devStreamScanSep streamScanSep +#define devStreamScanSep (0) #define devStreamScanf(record, format, value) \ streamScanfN(record, format, value, MAX_STRING_SIZE) #define streamScanf(record, format, value) \