From cbc7af0ef8fb25a27b1d08a5af8bbee5f64883d9 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 15 Aug 2016 20:19:19 -0500 Subject: [PATCH] Remove 2 obsolete dbStatic routines (forms) --- src/ioc/dbStatic/dbStaticLib.c | 61 ---------------------------------- src/ioc/dbStatic/dbStaticLib.h | 2 -- 2 files changed, 63 deletions(-) diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c index 9ef89e802..a09b999aa 100644 --- a/src/ioc/dbStatic/dbStaticLib.c +++ b/src/ioc/dbStatic/dbStaticLib.c @@ -3193,67 +3193,6 @@ int dbGetLinkType(DBENTRY *pdbentry) return(-1); } -long dbCvtLinkToConstant(DBENTRY *pdbentry) -{ - dbFldDes *pflddes; - DBLINK *plink; - - dbGetFieldAddress(pdbentry); - pflddes = pdbentry->pflddes; - if(!pflddes) return(-1); - plink = (DBLINK *)pdbentry->pfield; - if(!plink) return(-1); - switch (pflddes->field_type) { - case DBF_INLINK: - case DBF_OUTLINK: - case DBF_FWDLINK: - if(plink->type == CONSTANT) return(0); - if(plink->type != PV_LINK) return(S_dbLib_badLink); - free((void *)plink->value.pv_link.pvname); - plink->value.pv_link.pvname = NULL; - plink->type = CONSTANT; - if(pflddes->initial) { - plink->value.constantStr = - dbCalloc(strlen(pflddes->initial)+1,sizeof(char)); - strcpy(plink->value.constantStr,pflddes->initial); - } else { - plink->value.constantStr = NULL; - } - return(0); - default: - epicsPrintf("dbCvtLinkToConstant called for non link field\n"); - } - return(S_dbLib_badLink); -} - -long dbCvtLinkToPvlink(DBENTRY *pdbentry) -{ - dbFldDes *pflddes; - DBLINK *plink; - - dbGetFieldAddress(pdbentry); - pflddes = pdbentry->pflddes; - if(!pflddes) return(-1); - if(!pdbentry->precnode || !pdbentry->precnode->precord) return(-1); - plink = (DBLINK *)pdbentry->pfield; - if(!plink) return(-1); - switch (pflddes->field_type) { - case DBF_INLINK: - case DBF_OUTLINK: - case DBF_FWDLINK: - if(plink->type == PV_LINK) return(0); - if(plink->type != CONSTANT) return(S_dbLib_badLink); - free(plink->value.constantStr); - plink->type = PV_LINK; - plink->value.pv_link.pvlMask = 0; - plink->value.pv_link.pvname = 0; - return(0); - default: - epicsPrintf("dbCvtLinkToPvlink called for non link field\n"); - } - return(S_dbLib_badLink); -} - void dbDumpPath(DBBASE *pdbbase) { ELLLIST *ppathList; diff --git a/src/ioc/dbStatic/dbStaticLib.h b/src/ioc/dbStatic/dbStaticLib.h index e01bec25d..1015301b4 100644 --- a/src/ioc/dbStatic/dbStaticLib.h +++ b/src/ioc/dbStatic/dbStaticLib.h @@ -215,8 +215,6 @@ epicsShareFunc linkSup * dbFindLinkSup(dbBase *pdbbase, epicsShareFunc int dbGetNLinks(DBENTRY *pdbentry); epicsShareFunc long dbGetLinkField(DBENTRY *pdbentry, int index); epicsShareFunc int dbGetLinkType(DBENTRY *pdbentry); -epicsShareFunc long dbCvtLinkToConstant(DBENTRY *pdbentry); -epicsShareFunc long dbCvtLinkToPvlink(DBENTRY *pdbentry); /* Dump routines */ epicsShareFunc void dbDumpPath(DBBASE *pdbbase);