epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbfl_type_rec goes away

Browse Source
This commit is contained in:
Michael Davidsaver
2021-03-08 14:28:15 -08:00
parent bd3ecf1cbc
commit f69b938401
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/ioc/db/dbAccess.c
+2 -2
View File
@@ -361,7 +361,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
pbuffer = (char *)pushort;
}
if( (*options) & DBR_AMSG ) {
if (!pfl || pfl->type == dbfl_type_rec) {
if (!pfl) {
STATIC_ASSERT(sizeof(pcommon->amsg)==sizeof(pfl->amsg));
strncpy(pbuffer, pcommon->amsg, sizeof(pcommon->amsg)-1);
} else {
@@ -404,7 +404,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
}
if( (*options) & DBR_UTAG ) {
epicsUInt64 *ptag = (epicsUInt64*)pbuffer;
if (!pfl || pfl->type == dbfl_type_rec) {
if (!pfl) {
*ptag++ = pcommon->utag;
} else {
*ptag++ = pfl->utag;
modules/database/src/std/filters/utag.c
+1 -1
View File
@@ -47,7 +47,7 @@ static int parse_ok(void *raw)
static db_field_log* filter(void* raw, dbChannel *chan, db_field_log *pfl)
{
utagPvt *pvt = (utagPvt*)raw;
epicsUTag utag = pfl->type==dbfl_type_rec ? dbChannelRecord(chan)->utag : pfl->utag;
epicsUTag utag = pfl->utag;
int drop = (utag&pvt->mask)!=pvt->value;
if(pfl->ctx!=dbfl_context_event || pfl->mask&DBE_PROPERTY) {