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

fixed bugs

Browse Source
This commit is contained in:
Marty Kraimer
1996-09-04 15:26:58 +00:00
parent 36f74c934e
commit 333b379287
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/db/dbAccess.c
View File

@@ -670,7 +670,7 @@ long dbGetLinkValue(struct link *plink, short dbrType, void *pbuffer,
precord->pact = pact;
if(status) return(status);
}
if(ppv_link->pvlMask&pvlOptMS)
if(ppv_link->pvlMask&pvlOptMS && precord!= paddr->precord)
recGblSetSevr(precord,LINK_ALARM,paddr->precord->sevr);
if(ppv_link->getCvt && ppv_link->lastGetdbrType==dbrType) {
@@ -780,6 +780,7 @@ long dbGetField( DBADDR *paddr,short dbrType,void *pbuffer,
}
if(options && (*options))
getOptions(paddr,(void **)&pbuf,options,pflin);
if(nRequest && *nRequest==0) goto done;
dbInitEntry(pdbbase,&dbEntry);
if(status = dbFindRecord(&dbEntry,precord->name)) goto done;
if(status = dbFindField(&dbEntry,pfldDes->name)) goto done;

1
src/db/dbLock.c
View File

@@ -319,6 +319,7 @@ void dbLockSetMerge(dbCommon *pfirst,dbCommon *psecond)
lockSet *p1lockSet;
lockSet *p2lockSet;
if(pfirst==psecond) return;
p1lockSet = p1lockRecord->plockSet;
p2lockSet = p2lockRecord->plockSet;
if(!p1lockSet) {