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

db: Fix dbGet so attributes and value can be fetched simultaneously

Browse Source 
Only the Async Soft Channel support did this, so that's where it
was noticed that this didn't work.
This commit is contained in:
Andrew Johnson
2012-10-29 01:20:56 -05:00
parent 35a2793c23
commit c06f3cd9a0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ioc/db/dbAccess.c
View File

@@ -829,9 +829,10 @@ long dbGet(DBADDR *paddr, short dbrType,
if (nRequest) *nRequest = 1;
if (!pfl || pfl->type == dbfl_type_rec) {
status = dbFastGetConvertRoutine[field_type][dbrType]
(paddr->pfield, pbuffer, paddr);
(paddr->pfield, pbuf, paddr);
} else {
DBADDR localAddr = *paddr; /* Structure copy */
localAddr.field_type = pfl->field_type;
localAddr.field_size = pfl->field_size;
localAddr.no_elements = pfl->no_elements;
@@ -840,7 +841,7 @@ long dbGet(DBADDR *paddr, short dbrType,
else
localAddr.pfield = (char *) pfl->u.r.field;
status = dbFastGetConvertRoutine[field_type][dbrType]
(localAddr.pfield, pbuffer, &localAddr);
(localAddr.pfield, pbuf, &localAddr);
}
} else {
long n;
@@ -865,9 +866,10 @@ long dbGet(DBADDR *paddr, short dbrType,
if (n <= 0) {
;/*do nothing*/
} else if (!pfl || pfl->type == dbfl_type_rec) {
status = convert(paddr, pbuffer, n, no_elements, offset);
status = convert(paddr, pbuf, n, no_elements, offset);
} else {
DBADDR localAddr = *paddr; /* Structure copy */
localAddr.field_type = pfl->field_type;
localAddr.field_size = pfl->field_size;
localAddr.no_elements = pfl->no_elements;
@@ -875,7 +877,7 @@ long dbGet(DBADDR *paddr, short dbrType,
localAddr.pfield = (char *) &pfl->u.v.field;
else
localAddr.pfield = (char *) pfl->u.r.field;
status = convert(&localAddr, pbuffer, n, no_elements, offset);
status = convert(&localAddr, pbuf, n, no_elements, offset);
}
}
return status;