From 01adddfd3da8622fa839b1cad9e5903df76ae6af Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 30 Jul 2002 17:40:24 +0000 Subject: [PATCH] get rid of *Recdes* and *Fielddes* --- src/dbStatic/dbStaticLib.c | 31 +------------------------------ src/dbStatic/dbStaticLib.h | 22 +--------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c index 48114f205..c3b5977db 100644 --- a/src/dbStatic/dbStaticLib.c +++ b/src/dbStatic/dbStaticLib.c @@ -202,35 +202,6 @@ static char *getpMessage(DBENTRY *pdbentry); static long putPvLink(DBENTRY *pdbentry,short pvlMask,const char *pvname); static long epicsShareAPI dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length); -/*Following are obsolete. Will go away next release*/ -long epicsShareAPI dbRead(DBBASE *pdbbase,FILE *fp) -{ - return(dbReadDatabaseFP(&pdbbase,fp,0,0)); -} -long epicsShareAPI dbWrite(DBBASE *pdbbase,FILE *fpdctsdr,FILE *fp) -{ - fprintf(stderr,"dbWrite obsolete. It does NOTHING\n"); - return(-1); -} -long epicsShareAPI dbFindRecdes(DBENTRY *pdbentry,const char *recdesname) - {return dbFindRecordType(pdbentry,recdesname);} -long epicsShareAPI dbFirstRecdes(DBENTRY *pdbentry) - {return dbFirstRecordType(pdbentry);} -long epicsShareAPI dbNextRecdes(DBENTRY *pdbentry) - {return dbNextRecordType(pdbentry);} -char * epicsShareAPI dbGetRecdesName(DBENTRY *pdbentry) - {return dbGetRecordTypeName(pdbentry);} -int epicsShareAPI dbGetNRecdes(DBENTRY *pdbentry) - {return dbGetNRecordTypes(pdbentry);} -long epicsShareAPI dbFirstFielddes(DBENTRY *pdbentry,int dctonly) - {return dbFirstField(pdbentry,dctonly);} -long epicsShareAPI dbNextFielddes(DBENTRY *pdbentry,int dctonly) - {return dbNextField(pdbentry,dctonly);} -char ** epicsShareAPI dbGetChoices(DBENTRY *pdbentry) - {return dbGetMenuChoices(pdbentry);} -void epicsShareAPI dbDumpRecDes(DBBASE *pdbbase,const char *recordTypeName) - {dbDumpRecordType(pdbbase,recordTypeName);} - /* internal routines*/ static int fcloseNotSTD(FILE *stream) { @@ -3623,7 +3594,7 @@ void epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,const char *recordTypeName) } } -void epicsShareAPI dbDumpFldDes( +void epicsShareAPI dbDumpField( DBBASE *pdbbase,const char *recordTypeName,const char *fname) { dbRecordType *pdbRecordType; diff --git a/src/dbStatic/dbStaticLib.h b/src/dbStatic/dbStaticLib.h index 42626e886..dec693d14 100644 --- a/src/dbStatic/dbStaticLib.h +++ b/src/dbStatic/dbStaticLib.h @@ -100,26 +100,6 @@ epicsShareFunc long epicsShareAPI dbWriteBreaktable( DBBASE *pdbbase,const char *filename); epicsShareFunc long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp); -/*Following are obsolete. For now dbRead calls dbAsciiRead.*/ -/* dbWrite does nothing */ -#define DB_RECORDTYPE_IO 0x1 -#define DB_RECORD_IO 0x2 -epicsShareFunc long epicsShareAPI dbRead(DBBASE *pdbbase,FILE *fp); -epicsShareFunc long epicsShareAPI dbWrite( - DBBASE *pdbbase,FILE *fpdctsdr,FILE *fp); -epicsShareFunc long epicsShareAPI dbFindRecdes( - DBENTRY *pdbentry,const char *recdesname); -epicsShareFunc long epicsShareAPI dbFirstRecdes(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbNextRecdes(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetRecdesName(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNRecdes(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFirstFielddes(DBENTRY *pdbentry,int dctonly); -epicsShareFunc long epicsShareAPI dbNextFielddes(DBENTRY *pdbentry,int dctonly); -epicsShareFunc char ** epicsShareAPI dbGetChoices(DBENTRY *pdbentry); -epicsShareFunc void epicsShareAPI dbDumpRecDes( - DBBASE *pdbbase,const char *recordTypeName); -/*End obsolete routines*/ - epicsShareFunc long epicsShareAPI dbFindRecordType( DBENTRY *pdbentry,const char *recordTypename); epicsShareFunc long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry); @@ -225,7 +205,7 @@ epicsShareFunc void epicsShareAPI dbDumpMenu( DBBASE *pdbbase,const char *menuName); epicsShareFunc void epicsShareAPI dbDumpRecordType( DBBASE *pdbbase,const char *recordTypeName); -epicsShareFunc void epicsShareAPI dbDumpFldDes( +epicsShareFunc void epicsShareAPI dbDumpField( DBBASE *pdbbase,const char *recordTypeName,const char *fname); epicsShareFunc void epicsShareAPI dbDumpDevice( DBBASE *pdbbase,const char *recordTypeName);