From b3726f1cb483d6efb22218b62b0211d41e46e30e Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 5 Dec 1995 14:00:36 +0000 Subject: [PATCH] Fixed errors in initCommon --- src/db/dbAccess.c | 4 ++-- src/db/dbFastLinkConv.c | 2 +- src/db/iocInit.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c index 3231e7b93..130300063 100644 --- a/src/db/dbAccess.c +++ b/src/db/dbAccess.c @@ -157,14 +157,14 @@ long dbCommonInit(dbCommon *precord, int pass) * is equal to constant set in the record's disv field. */ status = recGblInitFastInLink(&(precord->sdis), - (void *) precord, DBF_SHORT, "DISA"); + (void *) precord, DBR_SHORT, "DISA"); if (status) recGblRecordError(status, (void *) precord, "dbCommonInit: SDIS"); /* * Initialize the time stamp link. */ status = recGblInitFastInLink(&(precord->tsel), - (void *) precord, DBF_SHORT, "TSE"); + (void *) precord, DBR_SHORT, "TSE"); if (status) recGblRecordError(status, (void *)precord, "dbCommonInit: TSEL"); diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c index 186204e03..0a8eb4e59 100644 --- a/src/db/dbFastLinkConv.c +++ b/src/db/dbFastLinkConv.c @@ -91,7 +91,7 @@ long cvt_uninit( void *to, struct dbAddr *paddr) { - printf("Error in record support, uninitialized link.\n"); + recGblDbaddrError(-1,paddr,"cvt_uninit: uninitialized link"); return(-1); } diff --git a/src/db/iocInit.c b/src/db/iocInit.c index 3e107fd33..007d6582e 100644 --- a/src/db/iocInit.c +++ b/src/db/iocInit.c @@ -515,6 +515,8 @@ LOCAL long initDatabase(void) /* Find pointer to record instance */ precord = pdbRecordNode->precord; if(!(precord->name[0])) continue; + rtnval = dbCommonInit(precord,1); + if (status==0) status = rtnval; precord->rset = prset; if(!prset->init_record) continue; rtnval = (*prset->init_record)(precord,1);