epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

better range check on index to gddAitToDbr

Browse Source
This commit is contained in:
Jeff Hill
1999-04-30 15:36:26 +00:00
parent 180e39e591
commit 93d8c939ab
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cas/generic/casPVIIL.h
View File

@@ -29,6 +29,9 @@
*
* History
* $Log$
* Revision 1.12 1998/06/16 02:21:49 jhill
* dont require that a server must exist before a PV is created
*
* Revision 1.11 1997/08/05 00:47:12 jhill
* fixed warnings
*
@@ -203,12 +206,15 @@ inline void casPVI::deleteSignal()
//
inline caStatus casPVI::bestDBRType (unsigned &dbrType)
{
int dbr = gddAitToDbr[(*this)->bestExternalType()];
if (INVALID_DB_FIELD(dbr)) {
unsigned bestAIT = (*this)->bestExternalType();
if (bestAIT<NELEMENTS(gddAitToDbr)&&bestAIT!=aitEnumInvalid) {
dbrType = gddAitToDbr[bestAIT];
return S_cas_success;
}
else {
return S_cas_badType;
}
dbrType = dbr;
return S_cas_success;
}
#include "casChannelIIL.h" // inline func for casChannelI
@@ -248,7 +254,7 @@ inline void casPVI::postEvent (const casEventMask &select, gdd &event)
inline aitIndex casPVI::nativeCount()
{
if ((*this)->maxDimension()==0u) {
return 1u; // scaler
return 1u; // scalar
}
return (*this)->maxBound(0u);
}