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

Ensure getOptions() gets called for structured DBR types.

Browse Source
This commit is contained in:
Andrew Johnson
2009-03-31 19:09:58 +00:00
parent 9a09be011f
commit 58b1017397
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/dbAccess.c
View File

@@ -361,6 +361,7 @@ static void getOptions(DBADDR *paddr,char **poriginal,long *options,void *pflin)
}
if( (*options) & DBR_TIME ) {
epicsUInt32 *ptime = (epicsUInt32 *)pbuffer;
if(pfl!=NULL) {
*ptime++ = pfl->time.secPastEpoch;
*ptime++ = pfl->time.nsec;
@@ -942,6 +943,10 @@ long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType,
char *pbuf = (char *)pbuffer;
int maxlen;
if (options && (*options))
getOptions(paddr, &pbuf, options, pflin);
if (nRequest && *nRequest == 0) goto done;
switch (dbrType) {
case DBR_STRING:
maxlen = MAX_STRING_SIZE - 1;
@@ -959,9 +964,6 @@ long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType,
goto done;
}
if (options && (*options))
getOptions(paddr, &pbuf, options, pflin);
if (nRequest && *nRequest == 0) goto done;
dbInitEntry(pdbbase, &dbEntry);
status = dbFindRecord(&dbEntry, precord->name);
if (!status) status = dbFindField(&dbEntry, pfldDes->name);