From 0dfcc0f5115d950c9eec1b67b92122037ddad3cf Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 6 Jun 2018 11:56:19 +0200 Subject: [PATCH] explicitly test streamPrintf and streamPrintfN for ERROR --- src/devaaiStream.c | 8 ++++---- src/devaaoStream.c | 8 ++++---- src/devaiStream.c | 4 ++-- src/devaoStream.c | 4 ++-- src/devbiStream.c | 6 +++--- src/devboStream.c | 6 +++--- src/devcalcoutStream.c | 5 +++-- src/devint64inStream.c | 2 +- src/devint64outStream.c | 2 +- src/devlonginStream.c | 2 +- src/devlongoutStream.c | 2 +- src/devmbbiDirectStream.c | 2 +- src/devmbbiStream.c | 6 +++--- src/devmbboDirectStream.c | 2 +- src/devmbboStream.c | 6 +++--- src/devscalcoutStream.c | 10 ++++++---- src/devstringinStream.c | 3 ++- src/devstringoutStream.c | 3 ++- src/devwaveformStream.c | 8 ++++---- 19 files changed, 47 insertions(+), 42 deletions(-) diff --git a/src/devaaiStream.c b/src/devaaiStream.c index 69ed5ed..18d69dc 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - if (streamScanf(record, format, &dval) != OK) + if (streamScanf(record, format, &dval) == ERROR) { return aai->nord ? OK : ERROR; } @@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_LONG: case DBF_ENUM: { - if (streamScanf(record, format, &lval) != OK) + if (streamScanf(record, format, &lval) == ERROR) { return aai->nord ? OK : ERROR; } @@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_STRING: if (streamScanfN(record, format, (char *)aai->bptr + aai->nord * MAX_STRING_SIZE, - MAX_STRING_SIZE) != OK) + MAX_STRING_SIZE) == ERROR) { return aai->nord ? OK : ERROR; } @@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format) memset(aai->bptr, 0, aai->nelm); aai->nord = 0; if (streamScanfN(record, format, - (char *)aai->bptr, aai->nelm) != OK) + (char *)aai->bptr, aai->nelm) == ERROR) { return ERROR; } diff --git a/src/devaaoStream.c b/src/devaaoStream.c index e3e6003..6bc0796 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - if (streamScanf(record, format, &dval) != OK) + if (streamScanf(record, format, &dval) == ERROR) { return aao->nord ? OK : ERROR; } @@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_LONG: case DBF_ENUM: { - if (streamScanf(record, format, &lval) != OK) + if (streamScanf(record, format, &lval) == ERROR) { return aao->nord ? OK : ERROR; } @@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_STRING: if (streamScanfN(record, format, (char *)aao->bptr + aao->nord * MAX_STRING_SIZE, - MAX_STRING_SIZE) != OK) + MAX_STRING_SIZE) == ERROR) { return aao->nord ? OK : ERROR; } @@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format) memset(aao->bptr, 0, aao->nelm); aao->nord = 0; if (streamScanfN(record, format, - (char *)aao->bptr, aao->nelm) != OK) + (char *)aao->bptr, aao->nelm) == ERROR) { return ERROR; } diff --git a/src/devaiStream.c b/src/devaiStream.c index 9df8ce9..3d8ae0e 100644 --- a/src/devaiStream.c +++ b/src/devaiStream.c @@ -34,14 +34,14 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; break; } case DBF_ULONG: case DBF_LONG: { long rval; - if (streamScanf(record, format, &rval)) return ERROR; + if (streamScanf(record, format, &rval) == ERROR) return ERROR; ai->rval = rval; if (ai->linr == 0) { diff --git a/src/devaoStream.c b/src/devaoStream.c index 232a67d..0d9eee2 100644 --- a/src/devaoStream.c +++ b/src/devaoStream.c @@ -32,14 +32,14 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; break; } case DBF_ULONG: case DBF_LONG: { long rval; - if (streamScanf(record, format, &rval)) return ERROR; + if (streamScanf(record, format, &rval) == ERROR) return ERROR; ao->rbv = rval; ao->rval = rval; if (ao->linr == 0) diff --git a/src/devbiStream.c b/src/devbiStream.c index 49bfadc..9d7e4d8 100644 --- a/src/devbiStream.c +++ b/src/devbiStream.c @@ -33,21 +33,21 @@ static long readData(dbCommon *record, format_t *format) case DBF_ULONG: case DBF_LONG: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (bi->mask) val &= bi->mask; bi->rval = val; return OK; } case DBF_ENUM: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; bi->val = (val != 0); return DO_NOT_CONVERT; } case DBF_STRING: { char buffer[sizeof(bi->znam)]; - if (streamScanfN(record, format, buffer, sizeof(buffer))) + if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR) return ERROR; if (strcmp (bi->znam, buffer) == 0) { diff --git a/src/devboStream.c b/src/devboStream.c index 41c6914..886d93f 100644 --- a/src/devboStream.c +++ b/src/devboStream.c @@ -33,7 +33,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ULONG: case DBF_LONG: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (bo->mask) val &= bo->mask; bo->rbv = val; if (INIT_RUN) bo->rval = val; @@ -41,14 +41,14 @@ static long readData(dbCommon *record, format_t *format) } case DBF_ENUM: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; bo->val = (val != 0); return DO_NOT_CONVERT; } case DBF_STRING: { char buffer[sizeof(bo->znam)]; - if (streamScanfN(record, format, buffer, sizeof(buffer))) + if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR) return ERROR; if (strcmp (bo->znam, buffer) == 0) { diff --git a/src/devcalcoutStream.c b/src/devcalcoutStream.c index fc36335..44b04db 100644 --- a/src/devcalcoutStream.c +++ b/src/devcalcoutStream.c @@ -30,7 +30,8 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - return streamScanf(record, format, &co->val); + if (streamScanf(record, format, &co->val) == ERROR) return ERROR; + return OK; } case DBF_ULONG: case DBF_LONG: @@ -38,7 +39,7 @@ static long readData(dbCommon *record, format_t *format) { long lval; - if (streamScanf(record, format, &lval)) return ERROR; + if (streamScanf(record, format, &lval) == ERROR) return ERROR; if (format->type == DBF_LONG) co->val = lval; else diff --git a/src/devint64inStream.c b/src/devint64inStream.c index 29f6b00..ab6007c 100644 --- a/src/devint64inStream.c +++ b/src/devint64inStream.c @@ -32,7 +32,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ENUM: { long val; - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (format->type == DBF_LONG) i64i->val = val; else diff --git a/src/devint64outStream.c b/src/devint64outStream.c index 826cc90..4afc59d 100644 --- a/src/devint64outStream.c +++ b/src/devint64outStream.c @@ -34,7 +34,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ENUM: { long val; - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (format->type == DBF_LONG) i64o->val = val; else diff --git a/src/devlonginStream.c b/src/devlonginStream.c index 8d8fa8f..b27ab49 100644 --- a/src/devlonginStream.c +++ b/src/devlonginStream.c @@ -33,7 +33,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ENUM: { long val; - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; li->val = val; return OK; } diff --git a/src/devlongoutStream.c b/src/devlongoutStream.c index 13e9587..8d3be5b 100644 --- a/src/devlongoutStream.c +++ b/src/devlongoutStream.c @@ -34,7 +34,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ENUM: { long val; - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; lo->val = val; return OK; } diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c index 4caa3f3..752c22a 100644 --- a/src/devmbbiDirectStream.c +++ b/src/devmbbiDirectStream.c @@ -30,7 +30,7 @@ static long readData(dbCommon *record, format_t *format) if (format->type == DBF_ULONG || format->type == DBF_LONG) { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (mbbiD->mask) { val &= mbbiD->mask; diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c index 1ee7741..15075b0 100644 --- a/src/devmbbiStream.c +++ b/src/devmbbiStream.c @@ -35,7 +35,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ULONG: case DBF_LONG: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; /* read VAL or RBV? Look if any value is defined */ if (mbbi->sdef) for (i=0; i<16; i++) { @@ -51,14 +51,14 @@ static long readData(dbCommon *record, format_t *format) } case DBF_ENUM: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; mbbi->val = val; return DO_NOT_CONVERT; } case DBF_STRING: { char buffer[sizeof(mbbi->zrst)]; - if (streamScanfN(record, format, buffer, sizeof(buffer))) + if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR) return ERROR; for (val = 0; val < 16; val++) { diff --git a/src/devmbboDirectStream.c b/src/devmbboDirectStream.c index 11966ec..9c8f23a 100644 --- a/src/devmbboDirectStream.c +++ b/src/devmbboDirectStream.c @@ -31,7 +31,7 @@ static long readData(dbCommon *record, format_t *format) if (format->type == DBF_ULONG || format->type == DBF_LONG) { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; if (mbboD->mask) { val &= mbboD->mask; diff --git a/src/devmbboStream.c b/src/devmbboStream.c index 8056765..7f18a40 100644 --- a/src/devmbboStream.c +++ b/src/devmbboStream.c @@ -35,7 +35,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_ULONG: case DBF_LONG: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; /* read VAL or RBV? Look if any value is defined */ if (mbbo->sdef) for (i=0; i<16; i++) { @@ -52,14 +52,14 @@ static long readData(dbCommon *record, format_t *format) } case DBF_ENUM: { - if (streamScanf(record, format, &val)) return ERROR; + if (streamScanf(record, format, &val) == ERROR) return ERROR; mbbo->val = val; return DO_NOT_CONVERT; } case DBF_STRING: { char buffer[sizeof(mbbo->zrst)]; - if (streamScanfN(record, format, buffer, sizeof(buffer))) + if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR) return ERROR; for (val = 0; val < 16; val++) { diff --git a/src/devscalcoutStream.c b/src/devscalcoutStream.c index 20c23d6..c3ab140 100644 --- a/src/devscalcoutStream.c +++ b/src/devscalcoutStream.c @@ -39,21 +39,23 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - return streamScanf(record, format, &sco->val); + if (streamScanf(record, format, &sco->val) == ERROR) return ERROR; + return OK; } case DBF_LONG: case DBF_ENUM: { long lval; - if (streamScanf(record, format, &lval)) return ERROR; + if (streamScanf(record, format, &lval) == ERROR) return ERROR; sco->val = lval; return OK; } case DBF_STRING: { - return (streamScanfN(record, format, - sco->sval, sizeof(sco->val))); + if ((streamScanfN(record, format, + sco->sval, sizeof(sco->val)) == ERROR) return ERROR; + return OK; } } return ERROR; diff --git a/src/devstringinStream.c b/src/devstringinStream.c index 1a3ef8c..c0a0434 100644 --- a/src/devstringinStream.c +++ b/src/devstringinStream.c @@ -28,7 +28,8 @@ static long readData(dbCommon *record, format_t *format) if (format->type == DBF_STRING) { - return streamScanfN(record, format, si->val, sizeof(si->val)); + if (streamScanfN(record, format, si->val, sizeof(si->val)) == ERROR) return ERROR; + return OK; } return ERROR; } diff --git a/src/devstringoutStream.c b/src/devstringoutStream.c index 39d1d78..63f49a7 100644 --- a/src/devstringoutStream.c +++ b/src/devstringoutStream.c @@ -28,7 +28,8 @@ static long readData(dbCommon *record, format_t *format) if (format->type == DBF_STRING) { - return streamScanfN(record, format, so->val, sizeof(so->val)); + if (streamScanfN(record, format, so->val, sizeof(so->val)) == ERROR) return ERROR; + return OK; } return ERROR; } diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index 6b982e9..7531355 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format) { case DBF_DOUBLE: { - if (streamScanf(record, format, &dval) != OK) + if (streamScanf(record, format, &dval) == ERROR) { return wf->nord ? OK : ERROR; } @@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_LONG: case DBF_ENUM: { - if (streamScanf(record, format, &lval) != OK) + if (streamScanf(record, format, &lval) == ERROR) { return wf->nord ? OK : ERROR; } @@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format) case DBF_STRING: if (streamScanfN(record, format, (char *)wf->bptr + wf->nord * MAX_STRING_SIZE, - MAX_STRING_SIZE) != OK) + MAX_STRING_SIZE) == ERROR) { return wf->nord ? OK : ERROR; } @@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format) memset(wf->bptr, 0, wf->nelm); wf->nord = 0; if (streamScanfN(record, format, - (char *)wf->bptr, wf->nelm) != OK) + (char *)wf->bptr, wf->nelm) == ERROR) { return ERROR; }