From 0bad9523111e78bf134641ce83d3448e48e0102b Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 29 Nov 1995 14:18:16 +0000 Subject: [PATCH] Changes for replacing default.dctsdr bu all ascii files --- src/as/asDbLib.c | 46 +++++++++++++++++++++++------------------- src/as/asLibRoutines.c | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/as/asDbLib.c b/src/as/asDbLib.c index dc23ef2b8..8d8365584 100644 --- a/src/as/asDbLib.c +++ b/src/as/asDbLib.c @@ -58,9 +58,13 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000). #include #include #include + #include #include +#include +#include #include +#include #include #include #include @@ -97,10 +101,10 @@ static int my_yyinput(char *buf, int max_size) static long asDbAddRecords(void) { - DBENTRY dbentry; - DBENTRY *pdbentry=&dbentry; - long status; - struct dbCommon *precord; + DBENTRY dbentry; + DBENTRY *pdbentry=&dbentry; + long status; + dbCommon *precord; dbInitEntry(pdbBase,pdbentry); status = dbFirstRecdes(pdbentry); @@ -235,7 +239,7 @@ int asInitAsyn(ASDBCALLBACK *pcallback) static void myCallback(CALLBACK *pcallback) { ASDBCALLBACK *pasdbcallback = (ASDBCALLBACK *)pcallback; - struct subRecord *precord; + subRecord *precord; struct rset *prset; callbackGetUser(precord,pcallback); @@ -245,12 +249,12 @@ static void myCallback(CALLBACK *pcallback) recGblSetSevr(precord,READ_ALARM,precord->brsv); recGblRecordError(pasdbcallback->status,precord,"asInit Failed"); } - dbScanLock((struct dbCommon *)precord); - (*prset->process)((struct dbCommon *)precord); - dbScanUnlock((struct dbCommon *)precord); + dbScanLock((dbCommon *)precord); + (*prset->process)((dbCommon *)precord); + dbScanUnlock((dbCommon *)precord); } -long asSubInit(struct subRecord *precord,int pass) +long asSubInit(subRecord *precord,int pass) { ASDBCALLBACK *pcallback; @@ -261,7 +265,7 @@ long asSubInit(struct subRecord *precord,int pass) return(0); } -long asSubProcess(struct subRecord *precord) +long asSubProcess(subRecord *precord) { ASDBCALLBACK *pcallback = (ASDBCALLBACK *)precord->dpvt; @@ -278,8 +282,8 @@ long asSubProcess(struct subRecord *precord) int asDbGetAsl(void *paddress) { - struct dbAddr *paddr = paddress; - struct fldDes *pflddes; + DBADDR *paddr = paddress; + dbFldDes *pflddes; pflddes = paddr->pfldDes; return((int)pflddes->as_level); @@ -287,8 +291,8 @@ int asDbGetAsl(void *paddress) ASMEMBERPVT asDbGetMemberPvt(void *paddress) { - struct dbAddr *paddr = paddress; - struct dbCommon *precord; + DBADDR *paddr = paddress; + dbCommon *precord; precord = paddr->precord; return((ASMEMBERPVT)precord->asp); @@ -303,13 +307,13 @@ static void astacCallback(ASCLIENTPVT clientPvt,asClientStatus status) int astac(char *pname,char *user,char *location) { - struct dbAddr *paddr; - long status; - ASCLIENTPVT *pasclientpvt=NULL; - struct dbCommon *precord; - struct fldDes *pflddes; + DBADDR *paddr; + long status; + ASCLIENTPVT *pasclientpvt=NULL; + dbCommon *precord; + dbFldDes *pflddes; - paddr = dbCalloc(1,sizeof(struct dbAddr) + sizeof(ASCLIENTPVT)); + paddr = dbCalloc(1,sizeof(DBADDR) + sizeof(ASCLIENTPVT)); pasclientpvt = (ASCLIENTPVT *)(paddr + 1); status=dbNameToAddr(pname,paddr); if(status) { @@ -331,7 +335,7 @@ int astac(char *pname,char *user,char *location) static void myMemberCallback(ASMEMBERPVT memPvt) { - struct dbCommon *precord; + dbCommon *precord; precord = asGetMemberPvt(memPvt); if(precord) printf(" Record:%s",precord->name); diff --git a/src/as/asLibRoutines.c b/src/as/asLibRoutines.c index 5b8456092..e945087f9 100644 --- a/src/as/asLibRoutines.c +++ b/src/as/asLibRoutines.c @@ -123,7 +123,7 @@ long asInitialize(ASINPUTFUNCPTR inputfunction) pasg->pavalue = asCalloc(ASMAXINP,sizeof(double)); pasg = (ASG *)ellNext((ELLNODE *)pasg); } - gphInitPvt(&pasbase->phash); + gphInitPvt(&pasbase->phash,256); /*Hash each uagname and each hagname*/ puag = (UAG *)ellFirst(&pasbase->uagList); while(puag) {