Removed precord arg from dbScanFwdLink
This commit is contained in:
+5
-4
@@ -464,19 +464,20 @@ long dbScanLink(dbCommon *pfrom, dbCommon *pto)
|
||||
return(status);
|
||||
}
|
||||
|
||||
void dbScanFwdLink(dbCommon *precord, struct link *plink)
|
||||
void dbScanFwdLink(struct link *plink)
|
||||
{
|
||||
dbCommon *precord;
|
||||
struct pv_link *pvlink;
|
||||
short fwdLinkValue;
|
||||
|
||||
if(plink->type==CONSTANT) return;
|
||||
if(plink->type!=DB_LINK && plink->type!=CA_LINK) return;
|
||||
pvlink = &plink->value.pv_link;
|
||||
precord = pvlink->precord;
|
||||
if(plink->type==DB_LINK) {
|
||||
DBADDR *paddr = (DBADDR *)plink->value.pv_link.pvt;
|
||||
dbScanPassive(precord,paddr->precord);
|
||||
return;
|
||||
}
|
||||
if(plink->type!=CA_LINK) return;
|
||||
pvlink = &plink->value.pv_link;
|
||||
if(!(pvlink->pvlMask & pvlOptFWD)) return;
|
||||
fwdLinkValue = 1;
|
||||
dbCaPutLink(plink,DBR_SHORT,&fwdLinkValue,1);
|
||||
|
||||
+1
-1
@@ -274,7 +274,7 @@ long dbGetNelements(struct link *plink,long *nelements);
|
||||
int dbIsLinkConnected(struct link *plink);
|
||||
long dbScanLink(struct dbCommon *pfrom, struct dbCommon *pto);
|
||||
long dbScanPassive(struct dbCommon *pfrom,struct dbCommon *pto);
|
||||
void dbScanFwdLink(dbCommon *precord, struct link *plink);
|
||||
void dbScanFwdLink(struct link *plink);
|
||||
long dbProcess(struct dbCommon *precord);
|
||||
long dbNameToAddr(char *pname,struct dbAddr *);
|
||||
long dbGetLinkValue(struct link *,short dbrType,
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/* recCompress.c */
|
||||
/* compressRecord.c */
|
||||
/* base/src/rec $Id$ */
|
||||
|
||||
/* recCompress.c - Record Support Routines for Compression records*/
|
||||
/*
|
||||
* Original Author: Bob Dalesio
|
||||
* Current Author: Marty Kraimer
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/* recFanout.c */
|
||||
/* fanoutRecord.c */
|
||||
/* base/src/rec $Id$ */
|
||||
|
||||
/* recFanout.c - Record Support Routines for Fanout records */
|
||||
/*
|
||||
* Original Author: Bob Dalesio
|
||||
* Current Author: Marty Kraimer
|
||||
@@ -136,8 +134,7 @@ static long process(pfanout)
|
||||
plink=&(pfanout->lnk1);
|
||||
state=pfanout->seln;
|
||||
for ( i=0; i<6; i++, state>>=1, plink++) {
|
||||
if(plink->type!=CONSTANT)
|
||||
dbScanFwdLink((dbCommon *)pfanout,plink);
|
||||
if(plink->type!=CONSTANT) dbScanFwdLink(plink);
|
||||
}
|
||||
break;
|
||||
case (fanoutSELM_Specified):
|
||||
@@ -149,8 +146,7 @@ static long process(pfanout)
|
||||
break;
|
||||
}
|
||||
plink=&(pfanout->lnk1);
|
||||
plink += (pfanout->seln-1);
|
||||
dbScanFwdLink((dbCommon *)pfanout,plink);
|
||||
plink += (pfanout->seln-1); dbScanFwdLink(plink);
|
||||
break;
|
||||
case (fanoutSELM_Mask):
|
||||
if(pfanout->seln==0) {
|
||||
@@ -163,8 +159,7 @@ static long process(pfanout)
|
||||
plink=&(pfanout->lnk1);
|
||||
state=pfanout->seln;
|
||||
for ( i=0; i<6; i++, state>>=1, plink++) {
|
||||
if(state & 1 && plink->type!=CONSTANT)
|
||||
dbScanFwdLink((dbCommon *)pfanout,plink);
|
||||
if(state & 1 && plink->type!=CONSTANT) dbScanFwdLink(plink);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user