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

explicitly test streamPrintf and streamPrintfN for ERROR

Browse Source
This commit is contained in:
zimoch
2018-06-06 11:56:19 +02:00
parent 90d657c687
commit 0dfcc0f511
19 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devaaiStream.c
View File

@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
if (streamScanf(record, format, &dval) != OK) if (streamScanf(record, format, &dval) == ERROR)
{ {
return aai->nord ? OK : ERROR; return aai->nord ? OK : ERROR;
} }
@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_LONG: case DBF_LONG:
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &lval) != OK) if (streamScanf(record, format, &lval) == ERROR)
{ {
return aai->nord ? OK : ERROR; return aai->nord ? OK : ERROR;
} }
@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_STRING: case DBF_STRING:
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)aai->bptr + aai->nord * MAX_STRING_SIZE, (char *)aai->bptr + aai->nord * MAX_STRING_SIZE,
MAX_STRING_SIZE) != OK) MAX_STRING_SIZE) == ERROR)
{ {
return aai->nord ? OK : ERROR; return aai->nord ? OK : ERROR;
} }
@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format)
memset(aai->bptr, 0, aai->nelm); memset(aai->bptr, 0, aai->nelm);
aai->nord = 0; aai->nord = 0;
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)aai->bptr, aai->nelm) != OK) (char *)aai->bptr, aai->nelm) == ERROR)
{ {
return ERROR; return ERROR;
} }

8
src/devaaoStream.c
View File

@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
if (streamScanf(record, format, &dval) != OK) if (streamScanf(record, format, &dval) == ERROR)
{ {
return aao->nord ? OK : ERROR; return aao->nord ? OK : ERROR;
} }
@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_LONG: case DBF_LONG:
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &lval) != OK) if (streamScanf(record, format, &lval) == ERROR)
{ {
return aao->nord ? OK : ERROR; return aao->nord ? OK : ERROR;
} }
@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_STRING: case DBF_STRING:
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)aao->bptr + aao->nord * MAX_STRING_SIZE, (char *)aao->bptr + aao->nord * MAX_STRING_SIZE,
MAX_STRING_SIZE) != OK) MAX_STRING_SIZE) == ERROR)
{ {
return aao->nord ? OK : ERROR; return aao->nord ? OK : ERROR;
} }
@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format)
memset(aao->bptr, 0, aao->nelm); memset(aao->bptr, 0, aao->nelm);
aao->nord = 0; aao->nord = 0;
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)aao->bptr, aao->nelm) != OK) (char *)aao->bptr, aao->nelm) == ERROR)
{ {
return ERROR; return ERROR;
} }

4
src/devaiStream.c
View File

@ -34,14 +34,14 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
break; break;
} }
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: case DBF_LONG:
{ {
long rval; long rval;
if (streamScanf(record, format, &rval)) return ERROR; if (streamScanf(record, format, &rval) == ERROR) return ERROR;
ai->rval = rval; ai->rval = rval;
if (ai->linr == 0) if (ai->linr == 0)
{ {

4
src/devaoStream.c
View File

@ -32,14 +32,14 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
break; break;
} }
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: case DBF_LONG:
{ {
long rval; long rval;
if (streamScanf(record, format, &rval)) return ERROR; if (streamScanf(record, format, &rval) == ERROR) return ERROR;
ao->rbv = rval; ao->rbv = rval;
ao->rval = rval; ao->rval = rval;
if (ao->linr == 0) if (ao->linr == 0)

6
src/devbiStream.c
View File

@ -33,21 +33,21 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: case DBF_LONG:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
if (bi->mask) val &= bi->mask; if (bi->mask) val &= bi->mask;
bi->rval = val; bi->rval = val;
return OK; return OK;
} }
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
bi->val = (val != 0); bi->val = (val != 0);
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
case DBF_STRING: case DBF_STRING:
{ {
char buffer[sizeof(bi->znam)]; char buffer[sizeof(bi->znam)];
if (streamScanfN(record, format, buffer, sizeof(buffer))) if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR)
return ERROR; return ERROR;
if (strcmp (bi->znam, buffer) == 0) if (strcmp (bi->znam, buffer) == 0)
{ {

6
src/devboStream.c
View File

@ -33,7 +33,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: case DBF_LONG:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
if (bo->mask) val &= bo->mask; if (bo->mask) val &= bo->mask;
bo->rbv = val; bo->rbv = val;
if (INIT_RUN) bo->rval = val; if (INIT_RUN) bo->rval = val;
@ -41,14 +41,14 @@ static long readData(dbCommon *record, format_t *format)
} }
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
bo->val = (val != 0); bo->val = (val != 0);
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
case DBF_STRING: case DBF_STRING:
{ {
char buffer[sizeof(bo->znam)]; char buffer[sizeof(bo->znam)];
if (streamScanfN(record, format, buffer, sizeof(buffer))) if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR)
return ERROR; return ERROR;
if (strcmp (bo->znam, buffer) == 0) if (strcmp (bo->znam, buffer) == 0)
{ {

5
src/devcalcoutStream.c
View File

@ -30,7 +30,8 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: 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_ULONG:
case DBF_LONG: case DBF_LONG:
@ -38,7 +39,7 @@ static long readData(dbCommon *record, format_t *format)
{ {
long lval; long lval;
if (streamScanf(record, format, &lval)) return ERROR; if (streamScanf(record, format, &lval) == ERROR) return ERROR;
if (format->type == DBF_LONG) if (format->type == DBF_LONG)
co->val = lval; co->val = lval;
else else

2
src/devint64inStream.c
View File

@ -32,7 +32,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ENUM: case DBF_ENUM:
{ {
long val; long val;
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
if (format->type == DBF_LONG) if (format->type == DBF_LONG)
i64i->val = val; i64i->val = val;
else else

2
src/devint64outStream.c
View File

@ -34,7 +34,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ENUM: case DBF_ENUM:
{ {
long val; long val;
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
if (format->type == DBF_LONG) if (format->type == DBF_LONG)
i64o->val = val; i64o->val = val;
else else

2
src/devlonginStream.c
View File

@ -33,7 +33,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ENUM: case DBF_ENUM:
{ {
long val; long val;
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
li->val = val; li->val = val;
return OK; return OK;
} }

2
src/devlongoutStream.c
View File

@ -34,7 +34,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ENUM: case DBF_ENUM:
{ {
long val; long val;
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
lo->val = val; lo->val = val;
return OK; return OK;
} }

2
src/devmbbiDirectStream.c
View File

@ -30,7 +30,7 @@ static long readData(dbCommon *record, format_t *format)
if (format->type == DBF_ULONG || format->type == DBF_LONG) 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) if (mbbiD->mask)
{ {
val &= mbbiD->mask; val &= mbbiD->mask;

6
src/devmbbiStream.c
View File

@ -35,7 +35,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: 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 */ /* read VAL or RBV? Look if any value is defined */
if (mbbi->sdef) for (i=0; i<16; i++) if (mbbi->sdef) for (i=0; i<16; i++)
{ {
@ -51,14 +51,14 @@ static long readData(dbCommon *record, format_t *format)
} }
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
mbbi->val = val; mbbi->val = val;
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
case DBF_STRING: case DBF_STRING:
{ {
char buffer[sizeof(mbbi->zrst)]; char buffer[sizeof(mbbi->zrst)];
if (streamScanfN(record, format, buffer, sizeof(buffer))) if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR)
return ERROR; return ERROR;
for (val = 0; val < 16; val++) for (val = 0; val < 16; val++)
{ {

2
src/devmbboDirectStream.c
View File

@ -31,7 +31,7 @@ static long readData(dbCommon *record, format_t *format)
if (format->type == DBF_ULONG || format->type == DBF_LONG) 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) if (mbboD->mask)
{ {
val &= mbboD->mask; val &= mbboD->mask;

6
src/devmbboStream.c
View File

@ -35,7 +35,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_ULONG: case DBF_ULONG:
case DBF_LONG: 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 */ /* read VAL or RBV? Look if any value is defined */
if (mbbo->sdef) for (i=0; i<16; i++) if (mbbo->sdef) for (i=0; i<16; i++)
{ {
@ -52,14 +52,14 @@ static long readData(dbCommon *record, format_t *format)
} }
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &val)) return ERROR; if (streamScanf(record, format, &val) == ERROR) return ERROR;
mbbo->val = val; mbbo->val = val;
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
case DBF_STRING: case DBF_STRING:
{ {
char buffer[sizeof(mbbo->zrst)]; char buffer[sizeof(mbbo->zrst)];
if (streamScanfN(record, format, buffer, sizeof(buffer))) if (streamScanfN(record, format, buffer, sizeof(buffer)) == ERROR)
return ERROR; return ERROR;
for (val = 0; val < 16; val++) for (val = 0; val < 16; val++)
{ {

10
src/devscalcoutStream.c
View File

@ -39,21 +39,23 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: 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_LONG:
case DBF_ENUM: case DBF_ENUM:
{ {
long lval; long lval;
if (streamScanf(record, format, &lval)) return ERROR; if (streamScanf(record, format, &lval) == ERROR) return ERROR;
sco->val = lval; sco->val = lval;
return OK; return OK;
} }
case DBF_STRING: case DBF_STRING:
{ {
return (streamScanfN(record, format, if ((streamScanfN(record, format,
sco->sval, sizeof(sco->val))); sco->sval, sizeof(sco->val)) == ERROR) return ERROR;
return OK;
} }
} }
return ERROR; return ERROR;

3
src/devstringinStream.c
View File

@ -28,7 +28,8 @@ static long readData(dbCommon *record, format_t *format)
if (format->type == DBF_STRING) 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; return ERROR;
} }

3
src/devstringoutStream.c
View File

@ -28,7 +28,8 @@ static long readData(dbCommon *record, format_t *format)
if (format->type == DBF_STRING) 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; return ERROR;
} }

8
src/devwaveformStream.c
View File

@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
if (streamScanf(record, format, &dval) != OK) if (streamScanf(record, format, &dval) == ERROR)
{ {
return wf->nord ? OK : ERROR; return wf->nord ? OK : ERROR;
} }
@ -61,7 +61,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_LONG: case DBF_LONG:
case DBF_ENUM: case DBF_ENUM:
{ {
if (streamScanf(record, format, &lval) != OK) if (streamScanf(record, format, &lval) == ERROR)
{ {
return wf->nord ? OK : ERROR; return wf->nord ? OK : ERROR;
} }
@ -107,7 +107,7 @@ static long readData(dbCommon *record, format_t *format)
case DBF_STRING: case DBF_STRING:
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)wf->bptr + wf->nord * MAX_STRING_SIZE, (char *)wf->bptr + wf->nord * MAX_STRING_SIZE,
MAX_STRING_SIZE) != OK) MAX_STRING_SIZE) == ERROR)
{ {
return wf->nord ? OK : ERROR; return wf->nord ? OK : ERROR;
} }
@ -117,7 +117,7 @@ static long readData(dbCommon *record, format_t *format)
memset(wf->bptr, 0, wf->nelm); memset(wf->bptr, 0, wf->nelm);
wf->nord = 0; wf->nord = 0;
if (streamScanfN(record, format, if (streamScanfN(record, format,
(char *)wf->bptr, wf->nelm) != OK) (char *)wf->bptr, wf->nelm) == ERROR)
{ {
return ERROR; return ERROR;
} }