From 9258159419d583aacacd68d245af3a2d09d9518c Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Fri, 1 Nov 1996 17:15:58 +0000 Subject: [PATCH] Removed precord arg from dbScanFwdLink --- src/db/dbAccess.c | 9 +++++---- src/db/dbAccess.h | 2 +- src/rec/compressRecord.c | 4 +--- src/rec/fanoutRecord.c | 13 ++++--------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c index 6805b346e..768be3a63 100644 --- a/src/db/dbAccess.c +++ b/src/db/dbAccess.c @@ -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); diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h index 6e46222d4..339cc613b 100644 --- a/src/db/dbAccess.h +++ b/src/db/dbAccess.h @@ -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, diff --git a/src/rec/compressRecord.c b/src/rec/compressRecord.c index 97f293668..edd640d31 100644 --- a/src/rec/compressRecord.c +++ b/src/rec/compressRecord.c @@ -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 diff --git a/src/rec/fanoutRecord.c b/src/rec/fanoutRecord.c index 1362a5487..98c5032f7 100644 --- a/src/rec/fanoutRecord.c +++ b/src/rec/fanoutRecord.c @@ -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: