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

ugly goto removed

Browse Source
This commit is contained in:
zimoch
2010-10-20 13:21:28 +00:00
parent 7cc19d2614
commit a3e68d7f7d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/StreamEpics.cc
View File

@ -1053,7 +1053,6 @@ bool Stream::
matchValue(const StreamFormat& format, const void* fieldaddress)
{
// this function must increase consumedInput
// [I use goto and feel very ashamed for it.]
long consumed;
long lval;
double dval;
@ -1077,29 +1076,25 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
case long_format:
{
consumed = scanValue(format, lval);
if (consumed < 0) goto noMoreElements;
((epicsInt32*)buffer)[nord] = lval;
if (consumed >= 0) ((epicsInt32*)buffer)[nord] = lval;
break;
}
case enum_format:
{
consumed = scanValue(format, lval);
if (consumed < 0) goto noMoreElements;
((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
if (consumed >= 0) ((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
break;
}
case double_format:
{
consumed = scanValue(format, dval);
if (consumed < 0) goto noMoreElements;
((epicsFloat64*)buffer)[nord] = dval;
if (consumed >= 0) ((epicsFloat64*)buffer)[nord] = dval;
break;
}
case string_format:
{
consumed = scanValue(format,
buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
if (consumed < 0) goto noMoreElements;
break;
}
default:
@ -1107,9 +1102,9 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
"Illegal format type\n", name());
return false;
}
if (consumed < 0) break;
consumedInput += consumed;
}
noMoreElements:
if (!nord)
{
// scan error: set other record to alarm status