diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index e922697a1..a71f339e0 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -398,7 +398,7 @@ static void getOptions(DBADDR *paddr,void **poriginal,long *options,void *pflin)
 	*poriginal = pbuffer;
 }
 
-struct rset * epicsShareAPI dbGetRset(struct dbAddr *paddr)
+struct rset * epicsShareAPI dbGetRset(const struct dbAddr *paddr)
 {
 	struct dbFldDes *pfldDes = (struct dbFldDes *)paddr->pfldDes;
 
@@ -406,7 +406,8 @@ struct rset * epicsShareAPI dbGetRset(struct dbAddr *paddr)
 	return(pfldDes->pdbRecordType->prset);
 }
 
-long epicsShareAPI dbPutAttribute(char *recordTypename,char *name,char*value)
+long epicsShareAPI dbPutAttribute(
+    const char *recordTypename,const char *name,const char*value)
 {
 	DBENTRY		dbEntry;
 	DBENTRY		*pdbEntry = &dbEntry;
@@ -421,7 +422,7 @@ long epicsShareAPI dbPutAttribute(char *recordTypename,char *name,char*value)
 	return(status);
 }
 
-int epicsShareAPI dbIsValueField(struct dbFldDes *pdbFldDes)
+int epicsShareAPI dbIsValueField(const struct dbFldDes *pdbFldDes)
 {
     if(pdbFldDes->pdbRecordType->indvalFlddes == pdbFldDes->indRecordType)
 	return(TRUE);
@@ -429,12 +430,12 @@ int epicsShareAPI dbIsValueField(struct dbFldDes *pdbFldDes)
 	return(FALSE);
 }
 
-int epicsShareAPI dbGetFieldIndex(struct dbAddr *paddr)
+int epicsShareAPI dbGetFieldIndex(const struct dbAddr *paddr)
 {
     return(((struct dbFldDes *)paddr->pfldDes)->indRecordType);
 }
 
-long epicsShareAPI dbGetNelements(struct link *plink,long *nelements)
+long epicsShareAPI dbGetNelements(const struct link *plink,long *nelements)
 {
     switch(plink->type) {
     case CONSTANT:
@@ -453,7 +454,7 @@ long epicsShareAPI dbGetNelements(struct link *plink,long *nelements)
     return(S_db_badField);
 }
 
-int epicsShareAPI dbIsLinkConnected(struct link *plink)
+int epicsShareAPI dbIsLinkConnected(const struct link *plink)
 {
     switch(plink->type) {
 	case DB_LINK: return(TRUE);
@@ -463,7 +464,7 @@ int epicsShareAPI dbIsLinkConnected(struct link *plink)
     return(FALSE);
 }
 
-int epicsShareAPI dbGetLinkDBFtype(struct link *plink)
+int epicsShareAPI dbGetLinkDBFtype(const struct link *plink)
 {
     switch(plink->type) {
 	case DB_LINK: 
@@ -756,8 +757,8 @@ int epicsShareAPI dbLoadRecords(char* pfilename, char* substitutions)
 }
 
 
-long epicsShareAPI dbGetLinkValue(struct link	*plink, short dbrType, void *pbuffer,
-	long *poptions, long *pnRequest)
+long epicsShareAPI dbGetLinkValue(struct link *plink,
+    short dbrType, void *pbuffer,long *poptions, long *pnRequest)
 {
     long		status = 0;
 
@@ -815,7 +816,7 @@ long epicsShareAPI dbGetLinkValue(struct link	*plink, short dbrType, void *pbuff
 	}
     }else if(plink->type==CA_LINK) {
 	struct dbCommon	*precord = plink->value.pv_link.precord;
-	struct pv_link	*pcalink = &(plink->value.pv_link);
+	const struct pv_link	*pcalink = &(plink->value.pv_link);
 	unsigned short sevr;
 
 	status=dbCaGetLink(plink,dbrType,pbuffer,&sevr,pnRequest);
@@ -831,8 +832,8 @@ long epicsShareAPI dbGetLinkValue(struct link	*plink, short dbrType, void *pbuff
     return(status);
 }
 
-long epicsShareAPI dbPutLinkValue(struct link *plink,short dbrType,
-	const void *pbuffer,long nRequest)
+long epicsShareAPI dbPutLinkValue(struct link *plink,
+    short dbrType,const void *pbuffer,long nRequest)
 {
 	long		status=0;
 
@@ -868,8 +869,8 @@ long epicsShareAPI dbPutLinkValue(struct link *plink,short dbrType,
 	return(status);
 }
 
-long epicsShareAPI dbGetField( DBADDR	*paddr,short dbrType,void *pbuffer,
-    long *options,long *nRequest,void *pflin)
+long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType,
+    void *pbuffer, long *options,long *nRequest,void *pflin)
 {
     short	dbfType = paddr->field_type;
     dbCommon	*precord = (dbCommon *)(paddr->precord);
@@ -911,8 +912,8 @@ done:
     return(status);
 }
 
-long epicsShareAPI dbGet(DBADDR *paddr,short dbrType,void *pbuffer,long *options,
-	long *nRequest,void *pflin)
+long epicsShareAPI dbGet(DBADDR *paddr,short dbrType,
+    void *pbuffer,long *options,long *nRequest,void *pflin)
 {
 	db_field_log	*pfl= (db_field_log *)pflin;
 	long		no_elements=paddr->no_elements;
@@ -995,7 +996,8 @@ long epicsShareAPI dbGet(DBADDR *paddr,short dbrType,void *pbuffer,long *options
         return(status);
 }
 
-long epicsShareAPI dbPutField(DBADDR *paddr,short dbrType,const void *pbuffer,long  nRequest)
+long epicsShareAPI dbPutField(
+    DBADDR *paddr,short dbrType,const void *pbuffer,long  nRequest)
 {
     long	status = 0;
     long	special=paddr->special;
@@ -1155,7 +1157,8 @@ long		offset;
     return(0);
 }
 
-long epicsShareAPI dbPut(DBADDR *paddr,short dbrType,const void *pbuffer,long nRequest)
+long epicsShareAPI dbPut(DBADDR *paddr,short dbrType,
+    const void *pbuffer,long nRequest)
 {
 	long		no_elements=paddr->no_elements;
 	long		dummy;
@@ -1228,7 +1231,7 @@ long epicsShareAPI dbPut(DBADDR *paddr,short dbrType,const void *pbuffer,long nR
 
 /* various utility routines */
 long epicsShareAPI dbGetControlLimits(
-    struct link *plink,double *low, double *high)
+    const struct link *plink,double *low, double *high)
 {
     struct buffer {
         DBRctrlDouble
@@ -1250,7 +1253,7 @@ long epicsShareAPI dbGetControlLimits(
 }
 
 long epicsShareAPI dbGetGraphicLimits(
-    struct link *plink,double *low, double *high)
+    const struct link *plink,double *low, double *high)
 {
     struct buffer {
         DBRgrDouble
@@ -1271,7 +1274,7 @@ long epicsShareAPI dbGetGraphicLimits(
     return(0);
 }
 
-long epicsShareAPI dbGetAlarmLimits(struct link *plink,
+long epicsShareAPI dbGetAlarmLimits(const struct link *plink,
 	double *lolo, double *low, double *high, double *hihi)
 {
     struct buffer {
@@ -1296,7 +1299,7 @@ long epicsShareAPI dbGetAlarmLimits(struct link *plink,
     return(0);
 }
 
-long epicsShareAPI dbGetPrecision(struct link *plink,short *precision)
+long epicsShareAPI dbGetPrecision(const struct link *plink,short *precision)
 {
     struct buffer {
         DBRprecision
@@ -1316,7 +1319,8 @@ long epicsShareAPI dbGetPrecision(struct link *plink,short *precision)
     return(0);
 }
 
-long epicsShareAPI dbGetUnits(struct link *plink,char *units,int unitsSize)
+long epicsShareAPI dbGetUnits(
+    const struct link *plink,char *units,int unitsSize)
 {
     struct buffer {
         DBRunits
@@ -1336,7 +1340,7 @@ long epicsShareAPI dbGetUnits(struct link *plink,char *units,int unitsSize)
     return(0);
 }
 
-long epicsShareAPI dbGetSevr(struct link *plink,short *severity)
+long epicsShareAPI dbGetSevr(const struct link *plink,short *severity)
 {
     DBADDR *paddr;
 
@@ -1347,7 +1351,7 @@ long epicsShareAPI dbGetSevr(struct link *plink,short *severity)
     return(0);
 }
 
-long epicsShareAPI dbGetTimeStamp(struct link *plink,epicsTimeStamp *pstamp)
+long epicsShareAPI dbGetTimeStamp(const struct link *plink,epicsTimeStamp *pstamp)
 {
     DBADDR *paddr;
 
diff --git a/src/db/dbAccessDefs.h b/src/db/dbAccessDefs.h
index c85c9c450..b9876e9e3 100644
--- a/src/db/dbAccessDefs.h
+++ b/src/db/dbAccessDefs.h
@@ -217,15 +217,15 @@ struct dbr_alDouble     {DBRalDouble};
         : (((DBADDR*)((PLNK)->value.pv_link.pvt))) \
     )
 
-epicsShareFunc struct rset * epicsShareAPI dbGetRset(struct dbAddr *paddr);
+epicsShareFunc struct rset * epicsShareAPI dbGetRset(const struct dbAddr *paddr);
 epicsShareFunc long epicsShareAPI dbPutAttribute(
-    char *recordTypename,char *name,char*value);
-epicsShareFunc int epicsShareAPI dbIsValueField(struct dbFldDes *pdbFldDes);
-epicsShareFunc int epicsShareAPI dbGetFieldIndex(struct dbAddr *paddr);
+    const char *recordTypename,const char *name,const char*value);
+epicsShareFunc int epicsShareAPI dbIsValueField(const struct dbFldDes *pdbFldDes);
+epicsShareFunc int epicsShareAPI dbGetFieldIndex(const struct dbAddr *paddr);
 epicsShareFunc long epicsShareAPI dbGetNelements(
-    struct link *plink,long *nelements);
-epicsShareFunc int epicsShareAPI dbIsLinkConnected(struct link *plink);
-epicsShareFunc int epicsShareAPI dbGetLinkDBFtype(struct link *plink);
+    const struct link *plink,long *nelements);
+epicsShareFunc int epicsShareAPI dbIsLinkConnected(const struct link *plink);
+epicsShareFunc int epicsShareAPI dbGetLinkDBFtype(const struct link *plink);
 epicsShareFunc long epicsShareAPI dbScanLink(
     struct dbCommon *pfrom, struct dbCommon *pto);
 epicsShareFunc long epicsShareAPI dbScanPassive(
@@ -251,19 +251,19 @@ epicsShareFunc long epicsShareAPI dbPut(
 
 /* various utility routines */
 epicsShareFunc long epicsShareAPI dbGetControlLimits(
-    struct link *plink,double *low, double *high);
+    const struct link *plink,double *low, double *high);
 epicsShareFunc long epicsShareAPI dbGetGraphicLimits(
-    struct link *plink,double *low, double *high);
+    const struct link *plink,double *low, double *high);
 epicsShareFunc long epicsShareAPI dbGetAlarmLimits(
-    struct link *plink,double *lolo, double *low, double *high, double *hihi);
+    const struct link *plink,double *lolo, double *low, double *high, double *hihi);
 epicsShareFunc long epicsShareAPI dbGetPrecision(
-    struct link *plink,short *precision);
+    const struct link *plink,short *precision);
 epicsShareFunc long epicsShareAPI dbGetUnits(
-    struct link *plink,char *units,int unitsSize);
+    const struct link *plink,char *units,int unitsSize);
 epicsShareFunc long epicsShareAPI dbGetSevr(
-    struct link *plink,short *severity);
+    const struct link *plink,short *severity);
 epicsShareFunc long epicsShareAPI dbGetTimeStamp(
-    struct link *plink,epicsTimeStamp *pstamp);
+    const struct link *plink,epicsTimeStamp *pstamp);
 
 typedef void(*SPC_ASCALLBACK)(struct dbCommon *);
 /*dbSpcAsRegisterCallback called by access security */
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index d5d235765..dc467d58f 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -246,7 +246,7 @@ long epicsShareAPI dbCaPutLink(struct link *plink,short dbrType,
     return(status);
 }
 
-long epicsShareAPI dbCaGetAttributes(struct link *plink,
+long epicsShareAPI dbCaGetAttributes(const struct link *plink,
 	void (*callback)(void *usrPvt),void *usrPvt)
 {
     caLink	*pca;
@@ -280,7 +280,7 @@ long epicsShareAPI dbCaGetAttributes(struct link *plink,
     return(status);
 }
 
-caAttributes *getpcaAttributes(struct link *plink)
+caAttributes *getpcaAttributes(const struct link *plink)
 {
     caLink	*pca;
 
@@ -290,7 +290,8 @@ caAttributes *getpcaAttributes(struct link *plink)
     return(pca->pcaAttributes);
 }
 
-long epicsShareAPI dbCaGetControlLimits(struct link *plink,double *low, double *high)
+long epicsShareAPI dbCaGetControlLimits(
+    const struct link *plink,double *low, double *high)
 {
     caAttributes *pcaAttributes;
 
@@ -301,7 +302,8 @@ long epicsShareAPI dbCaGetControlLimits(struct link *plink,double *low, double *
     return(0);
 }
 
-long epicsShareAPI dbCaGetGraphicLimits(struct link *plink,double *low, double *high)
+long epicsShareAPI dbCaGetGraphicLimits(
+    const struct link *plink,double *low, double *high)
 {
     caAttributes *pcaAttributes;
 
@@ -312,8 +314,9 @@ long epicsShareAPI dbCaGetGraphicLimits(struct link *plink,double *low, double *
     return(0);
 }
 
-long epicsShareAPI dbCaGetAlarmLimits(struct link *plink,
-	double *lolo, double *low, double *high, double *hihi)
+long epicsShareAPI dbCaGetAlarmLimits(
+    const struct link *plink,
+    double *lolo, double *low, double *high, double *hihi)
 {
     caAttributes *pcaAttributes;
 
@@ -326,7 +329,8 @@ long epicsShareAPI dbCaGetAlarmLimits(struct link *plink,
     return(0);
 }
 
-long epicsShareAPI dbCaGetPrecision(struct link *plink,short *precision)
+long epicsShareAPI dbCaGetPrecision(
+    const struct link *plink,short *precision)
 {
     caAttributes *pcaAttributes;
 
@@ -336,7 +340,8 @@ long epicsShareAPI dbCaGetPrecision(struct link *plink,short *precision)
     return(0);
 }
 
-long epicsShareAPI dbCaGetUnits(struct link *plink,char *units,int unitsSize)
+long epicsShareAPI dbCaGetUnits(
+    const struct link *plink,char *units,int unitsSize)
 {
     caAttributes *pcaAttributes;
 
@@ -347,7 +352,8 @@ long epicsShareAPI dbCaGetUnits(struct link *plink,char *units,int unitsSize)
     return(0);
 }
 
-long epicsShareAPI dbCaGetNelements(struct link *plink,long *nelements)
+long epicsShareAPI dbCaGetNelements(
+    const struct link *plink,long *nelements)
 {
     caLink	*pca;
 
@@ -359,7 +365,8 @@ long epicsShareAPI dbCaGetNelements(struct link *plink,long *nelements)
     return(0);
 }
 
-long epicsShareAPI dbCaGetSevr(struct link *plink,short *severity)
+long epicsShareAPI dbCaGetSevr(
+    const struct link *plink,short *severity)
 {
     caLink	*pca;
 
@@ -371,7 +378,8 @@ long epicsShareAPI dbCaGetSevr(struct link *plink,short *severity)
     return(0);
 }
 
-long epicsShareAPI dbCaGetTimeStamp(struct link *plink,epicsTimeStamp *pstamp)
+long epicsShareAPI dbCaGetTimeStamp(
+    const struct link *plink,epicsTimeStamp *pstamp)
 {
     caLink	*pca;
 
@@ -383,7 +391,8 @@ long epicsShareAPI dbCaGetTimeStamp(struct link *plink,epicsTimeStamp *pstamp)
     return(0);
 }
 
-int epicsShareAPI dbCaIsLinkConnected(struct link *plink)
+int epicsShareAPI dbCaIsLinkConnected(
+    const struct link *plink)
 {
     caLink	*pca;
 
@@ -395,7 +404,8 @@ int epicsShareAPI dbCaIsLinkConnected(struct link *plink)
     if(ca_state(pca->chid)==cs_conn) return(TRUE);
     return(FALSE);
 }
-int epicsShareAPI dbCaGetLinkDBFtype(struct link *plink)
+int epicsShareAPI dbCaGetLinkDBFtype(
+    const struct link *plink)
 {
     caLink	*pca;
 
diff --git a/src/db/dbCa.h b/src/db/dbCa.h
index bdd55a582..fc6c1d251 100644
--- a/src/db/dbCa.h
+++ b/src/db/dbCa.h
@@ -24,24 +24,24 @@ epicsShareFunc long epicsShareAPI dbCaGetLink(
 epicsShareFunc long epicsShareAPI dbCaPutLink(
     struct link *plink,short dbrType,const void *pbuffer,long nRequest);
 epicsShareFunc long epicsShareAPI dbCaGetAttributes(
-    struct link *plink,void (*callback)(void *usrPvt),void *usrPvt);
+    const struct link *plink,void (*callback)(void *usrPvt),void *usrPvt);
 epicsShareFunc long epicsShareAPI dbCaGetControlLimits(
-    struct link *plink,double *low, double *high);
+    const struct link *plink,double *low, double *high);
 epicsShareFunc long epicsShareAPI dbCaGetGraphicLimits(
-    struct link *plink,double *low, double *high);
+    const struct link *plink,double *low, double *high);
 epicsShareFunc long epicsShareAPI dbCaGetAlarmLimits(
-    struct link *plink,double *lolo, double *low, double *high, double *hihi);
+    const struct link *plink,double *lolo, double *low, double *high, double *hihi);
 epicsShareFunc long epicsShareAPI dbCaGetPrecision(
-    struct link *plink,short *precision);
+    const struct link *plink,short *precision);
 epicsShareFunc long epicsShareAPI dbCaGetUnits(
-    struct link *plink,char *units,int unitsSize);
+    const struct link *plink,char *units,int unitsSize);
 epicsShareFunc long epicsShareAPI dbCaGetNelements(
-    struct link *plink,long *nelements);
+    const struct link *plink,long *nelements);
 epicsShareFunc long epicsShareAPI dbCaGetSevr(
-    struct link *plink,short *severity);
+    const struct link *plink,short *severity);
 epicsShareFunc long epicsShareAPI dbCaGetTimeStamp(
-    struct link *plink,epicsTimeStamp *pstamp);
-epicsShareFunc int epicsShareAPI dbCaIsLinkConnected(struct link *plink);
-epicsShareFunc int epicsShareAPI dbCaGetLinkDBFtype(struct link *plink);
+    const struct link *plink,epicsTimeStamp *pstamp);
+epicsShareFunc int epicsShareAPI dbCaIsLinkConnected(const struct link *plink);
+epicsShareFunc int epicsShareAPI dbCaGetLinkDBFtype(const struct link *plink);
 
 #endif /*INCdbCah*/
diff --git a/src/db/dbTest.c b/src/db/dbTest.c
index b7e297988..875e824ba 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -350,7 +350,7 @@ long epicsShareAPI dbpr(char *pname,int interest_level)
     int              tab_size;
 
     if (pname == NULL)
-        return;
+        return(0);
     pmsg = pMsgBuff->message;
     tab_size = 20;
 
diff --git a/src/dbStatic/dbPvdLib.c b/src/dbStatic/dbPvdLib.c
index 4f2e14cbb..9e9a0189d 100644
--- a/src/dbStatic/dbPvdLib.c
+++ b/src/dbStatic/dbPvdLib.c
@@ -65,7 +65,7 @@ static unsigned char T[256] = {
 };
 
 
-static unsigned short hash( char *pname, int length)
+static unsigned short hash( const char *pname, int length)
 {
     unsigned char h0=0;
     unsigned char h1=0;
@@ -120,7 +120,7 @@ void    dbPvdInitPvt(dbBase *pdbbase)
     return;
 }
 
-PVDENTRY *dbPvdFind(dbBase *pdbbase,char *name,int lenName)
+PVDENTRY *dbPvdFind(dbBase *pdbbase,const char *name,int lenName)
 {
     unsigned short	hashInd;
     ELLLIST		**ppvd = (ELLLIST **) pdbbase->ppvd;
diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c
index 47490e588..d0c1999cd 100644
--- a/src/dbStatic/dbStaticLib.c
+++ b/src/dbStatic/dbStaticLib.c
@@ -203,12 +203,12 @@ sizeof(promptRF_IO)/sizeof(char *),
 sizeof(promptVXI_IO)/sizeof(char *)};
 
 /*forward references for private routines*/
-static long putParmString(char **pparm,char *pstring);
+static long putParmString(char **pparm,const char *pstring);
 static long mapLINKTtoFORMT(DBLINK *plink,dbFldDes *pflddes,int *ind);
 static void entryErrMessage(DBENTRY *pdbentry,long status,char *mess);
 static void zeroDbentry(DBENTRY *pdbentry);
 static char *getpMessage(DBENTRY *pdbentry);
-static long putPvLink(DBENTRY *pdbentry,short pvlMask,char *pvname);
+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*/
@@ -221,7 +221,7 @@ long epicsShareAPI dbWrite(DBBASE *pdbbase,FILE *fpdctsdr,FILE *fp)
     fprintf(stderr,"dbWrite obsolete. It does NOTHING\n");
     return(-1);
 }
-long epicsShareAPI dbFindRecdes(DBENTRY *pdbentry,char *recdesname)
+long epicsShareAPI dbFindRecdes(DBENTRY *pdbentry,const char *recdesname)
 	{return dbFindRecordType(pdbentry,recdesname);}
 long epicsShareAPI dbFirstRecdes(DBENTRY *pdbentry)
 	{return dbFirstRecordType(pdbentry);}
@@ -237,7 +237,7 @@ long epicsShareAPI dbNextFielddes(DBENTRY *pdbentry,int dctonly)
 	{return dbNextField(pdbentry,dctonly);}
 char ** epicsShareAPI dbGetChoices(DBENTRY *pdbentry)
 	{return dbGetMenuChoices(pdbentry);}
-void epicsShareAPI dbDumpRecDes(DBBASE *pdbbase,char *recordTypeName)
+void epicsShareAPI dbDumpRecDes(DBBASE *pdbbase,const char *recordTypeName)
 	{dbDumpRecordType(pdbbase,recordTypeName);}
 
 /* internal routines*/
@@ -320,7 +320,7 @@ done:
     return(status);
 }
 
-static long putParmString(char **pparm,char *pstring)
+static long putParmString(char **pparm,const char *pstring)
 {
     size_t	size;
 
@@ -466,7 +466,7 @@ static char *getpMessage(DBENTRY *pdbentry)
     return(pdbentry->message);
 }
 
-static long putPvLink(DBENTRY *pdbentry,short pvlMask,char *pvname)
+static long putPvLink(DBENTRY *pdbentry,short pvlMask,const char *pvname)
 {
     dbFldDes	*pflddes;
     DBLINK	*plink;
@@ -859,7 +859,7 @@ static long epicsShareAPI dbAddOnePath (DBBASE *pdbbase, const char *path, unsig
 
 
 long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase,const char *filename,
-	char *precordTypename,int level)
+	const char *precordTypename,int level)
 {
     FILE	*outFile;
 
@@ -872,7 +872,8 @@ long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase,const char *filename,
     return(fcloseNotSTD(outFile));
 }
 
-long epicsShareAPI dbWriteRecordFP(DBBASE *pdbbase,FILE *fp,char *precordTypename,int level)
+long epicsShareAPI dbWriteRecordFP(
+    DBBASE *pdbbase,FILE *fp,const char *precordTypename,int level)
 {
     DBENTRY	dbentry;
     DBENTRY	*pdbentry=&dbentry;
@@ -939,7 +940,8 @@ long epicsShareAPI dbWriteRecordFP(DBBASE *pdbbase,FILE *fp,char *precordTypenam
     return(0);
 }
 
-long epicsShareAPI dbWriteMenu(DBBASE *ppdbbase,const char *filename,char *menuName)
+long epicsShareAPI dbWriteMenu(
+    DBBASE *ppdbbase,const char *filename,const char *menuName)
 {
     FILE	*outFile;
 
@@ -955,7 +957,7 @@ long epicsShareAPI dbWriteMenu(DBBASE *ppdbbase,const char *filename,char *menuN
     return(0);
 }
 
-long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,char *menuName)
+long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,const char *menuName)
 {
     dbMenu	*pdbMenu;
     int		gotMatch;
@@ -986,7 +988,8 @@ long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,char *menuName)
     return(0);
 }
 
-long epicsShareAPI dbWriteRecordType(DBBASE *pdbbase,const char *filename,char *recordTypeName)
+long epicsShareAPI dbWriteRecordType(
+    DBBASE *pdbbase,const char *filename,const char *recordTypeName)
 {
     FILE	*outFile;
 
@@ -1002,7 +1005,8 @@ long epicsShareAPI dbWriteRecordType(DBBASE *pdbbase,const char *filename,char *
     return(0);
 }
 
-long epicsShareAPI dbWriteRecordTypeFP(DBBASE *pdbbase,FILE *fp,char *recordTypeName)
+long epicsShareAPI dbWriteRecordTypeFP(
+    DBBASE *pdbbase,FILE *fp,const char *recordTypeName)
 {
     dbRecordType	*pdbRecordType;
     dbFldDes	*pdbFldDes;
@@ -1246,7 +1250,8 @@ int epicsShareAPI dbGetNRecordTypes(DBENTRY *pdbentry)
     return(ellCount(&pdbentry->pdbbase->recordTypeList));
 }
 
-long epicsShareAPI dbPutRecordAttribute(DBENTRY *pdbentry, char *name,char*value)
+long epicsShareAPI dbPutRecordAttribute(
+    DBENTRY *pdbentry, const char *name, const char*value)
 {
     dbRecordType	*precordType = pdbentry->precordType;
     int			createNew = TRUE;
@@ -1292,7 +1297,7 @@ long epicsShareAPI dbPutRecordAttribute(DBENTRY *pdbentry, char *name,char*value
     return(0);
 }
 
-long epicsShareAPI dbGetRecordAttribute(DBENTRY *pdbentry,char *name)
+long epicsShareAPI dbGetRecordAttribute(DBENTRY *pdbentry,const char *name)
 {
     dbRecordType	*precordType = pdbentry->precordType;
     int			compare;
@@ -1419,7 +1424,7 @@ int epicsShareAPI dbGetPromptGroup(DBENTRY *pdbentry)
     return(pflddes->promptgroup);
 }
 
-long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,char *precordName)
+long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,const char *precordName)
 {
     dbRecordType	*precordType = pdbentry->precordType;
     dbFldDes		*pdbFldDes;
@@ -1575,7 +1580,7 @@ char * epicsShareAPI dbGetRecordName(DBENTRY *pdbentry)
     return(dbRecordName(pdbentry));
 }
 
-long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry,char *newName)
+long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry,const char *newName)
 {
     dbBase		*pdbbase = pdbentry->pdbbase;
     dbRecordType	*precordType = pdbentry->precordType;
@@ -1647,7 +1652,7 @@ int epicsShareAPI dbIsVisibleRecord(DBENTRY *pdbentry)
     return(precnode->visible?1:0);
 }
 
-long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,char *newRecordName,int overWriteOK)
+long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int overWriteOK)
 {
     dbRecordType	*precordType = pdbentry->precordType;
     dbFldDes		*pdbFldDes;
@@ -1936,7 +1941,7 @@ char * epicsShareAPI dbGetString(DBENTRY *pdbentry)
     return (message);
 }
 
-long epicsShareAPI dbPutString(DBENTRY *pdbentry,char *pstring)
+long epicsShareAPI dbPutString(DBENTRY *pdbentry,const char *pstring)
 {
     dbFldDes  	*pflddes = pdbentry->pflddes;
     void	*pfield = pdbentry->pfield;
@@ -2312,7 +2317,7 @@ done:
     return(status);
 }
 
-char * epicsShareAPI dbVerify(DBENTRY *pdbentry,char *pstring)
+char * epicsShareAPI dbVerify(DBENTRY *pdbentry,const char *pstring)
 {
     dbFldDes  	*pflddes = pdbentry->pflddes;
     char	*message;
@@ -2639,7 +2644,7 @@ long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *stri
     return (0);
 }
 
-brkTable * epicsShareAPI dbFindBrkTable(dbBase *pdbbase,char *name)
+brkTable * epicsShareAPI dbFindBrkTable(dbBase *pdbbase,const char *name)
 {
     GPHENTRY *pgph;
 
@@ -2648,7 +2653,7 @@ brkTable * epicsShareAPI dbFindBrkTable(dbBase *pdbbase,char *name)
     return((brkTable *)pgph->userPvt);
 }
 
-dbMenu * epicsShareAPI dbFindMenu(dbBase *pdbbase,char *name)
+dbMenu * epicsShareAPI dbFindMenu(dbBase *pdbbase,const char *name)
 {
     GPHENTRY *pgph;
 
@@ -2733,7 +2738,7 @@ char * epicsShareAPI dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index)
     return (NULL);
 }
 
-int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, char *choice)
+int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, const char *choice)
 {
     dbFldDes  	*pflddes = pdbentry->pflddes;
     int		ind;
@@ -3067,7 +3072,7 @@ long epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value)
 	    DBENTRY	*plinkentry = &dbEntry;
 	    short	ppOpt = 0;
 	    short	msOpt = 0;
-	    char	*pstr;
+	    const char	*pstr;
 
 	    pstr = *value;
 	    **verify = 0;
@@ -3103,7 +3108,7 @@ long epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value)
 	    DBENTRY	*plinkentry = &dbEntry;
 	    short	ppOpt = 0;
 	    short	msOpt = 0;
-	    char	*pstr;
+	    const char	*pstr;
 
 	    pstr = *value;
 	    **verify = 0;
@@ -3135,7 +3140,7 @@ long epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value)
     case FORM_FWDLINK: {
 	    short	ppOpt = 0;
 	    short	msOpt = 0;
-	    char	*pstr;
+	    const char	*pstr;
 
 	    pstr = *value;
 	    **verify = 0;
@@ -3562,7 +3567,8 @@ void  epicsShareAPI dbDumpPath(DBBASE *pdbbase)
     return;
 }
 
-void  epicsShareAPI dbDumpRecord(dbBase *pdbbase,char *precordTypename,int level)
+void  epicsShareAPI dbDumpRecord(
+    dbBase *pdbbase,const char *precordTypename,int level)
 {
     if(!pdbbase) {
 	printf("pdbbase not specified\n");
@@ -3571,7 +3577,7 @@ void  epicsShareAPI dbDumpRecord(dbBase *pdbbase,char *precordTypename,int level
     dbWriteRecordFP(pdbbase,stdout,precordTypename,level);
 }
 
-void  epicsShareAPI dbDumpMenu(DBBASE *pdbbase,char *menuName)
+void  epicsShareAPI dbDumpMenu(DBBASE *pdbbase,const char *menuName)
 {
     if(!pdbbase) {
 	printf("pdbbase not specified\n");
@@ -3580,7 +3586,7 @@ void  epicsShareAPI dbDumpMenu(DBBASE *pdbbase,char *menuName)
     dbWriteMenuFP(pdbbase,stdout,menuName);
 }
 
-void  epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,char *recordTypeName)
+void  epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,const char *recordTypeName)
 {
     dbRecordType	*pdbRecordType;
     dbFldDes	*pdbFldDes;
@@ -3622,7 +3628,8 @@ void  epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,char *recordTypeName)
     }
 }
 
-void  epicsShareAPI dbDumpFldDes(DBBASE *pdbbase,char *recordTypeName,char *fname)
+void  epicsShareAPI dbDumpFldDes(
+    DBBASE *pdbbase,const char *recordTypeName,const char *fname)
 {
     dbRecordType	*pdbRecordType;
     dbFldDes	*pdbFldDes;
@@ -3710,7 +3717,7 @@ void  epicsShareAPI dbDumpFldDes(DBBASE *pdbbase,char *recordTypeName,char *fnam
     }
 }
 
-void  epicsShareAPI dbDumpDevice(DBBASE *pdbbase,char *recordTypeName)
+void  epicsShareAPI dbDumpDevice(DBBASE *pdbbase,const char *recordTypeName)
 {
     dbRecordType	*pdbRecordType;
     devSup	*pdevSup;
@@ -3750,7 +3757,7 @@ void  epicsShareAPI dbDumpDriver(DBBASE *pdbbase)
     dbWriteDriverFP(pdbbase,stdout);
 }
 
-void  epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase,char *name)
+void  epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase,const char *name)
 {
     brkTable	*pbrkTable;
     brkInt	*pbrkInt;
diff --git a/src/dbStatic/dbStaticLib.h b/src/dbStatic/dbStaticLib.h
index 4c5ed961b..1eff7c91e 100644
--- a/src/dbStatic/dbStaticLib.h
+++ b/src/dbStatic/dbStaticLib.h
@@ -84,27 +84,37 @@ epicsShareFunc void epicsShareAPI dbFreeEntry(DBENTRY *pdbentry);
 epicsShareFunc void epicsShareAPI dbInitEntry(DBBASE *pdbbase,DBENTRY *pdbentry);
 epicsShareFunc void epicsShareAPI dbFinishEntry(DBENTRY *pdbentry);
 epicsShareFunc DBENTRY * epicsShareAPI dbCopyEntry(DBENTRY *pdbentry);
-epicsShareFunc void epicsShareAPI dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto);
+epicsShareFunc void epicsShareAPI dbCopyEntryContents(
+    DBENTRY *pfrom,DBENTRY *pto);
 
-epicsShareFunc long epicsShareAPI dbReadDatabase(DBBASE **ppdbbase,const char *filename,
-	const char *path,const char *substitutions);
-epicsShareFunc long epicsShareAPI dbReadDatabaseFP(DBBASE **ppdbbase,FILE *fp,
-	const char *path,const char *substitutions);
+epicsShareFunc long epicsShareAPI dbReadDatabase(
+    DBBASE **ppdbbase,const char *filename,
+    const char *path,const char *substitutions);
+epicsShareFunc long epicsShareAPI dbReadDatabaseFP(
+    DBBASE **ppdbbase,FILE *fp, const char *path,const char *substitutions);
 epicsShareFunc long epicsShareAPI dbPath(DBBASE *pdbbase,const char *path);
 epicsShareFunc long epicsShareAPI dbAddPath(DBBASE *pdbbase,const char *path);
-epicsShareFunc long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase,const char *filename,
-	char *precordTypename,int level);
-epicsShareFunc long epicsShareAPI dbWriteRecordFP(DBBASE *ppdbbase,FILE *fp,
-	char *precordTypename,int level);
-epicsShareFunc long epicsShareAPI dbWriteMenu(DBBASE *pdbbase,const char *filename,char *menuName);
-epicsShareFunc long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,char *menuName);
-epicsShareFunc long epicsShareAPI dbWriteRecordType(DBBASE *pdbbase,const char *filename,char *recordTypeName);
-epicsShareFunc long epicsShareAPI dbWriteRecordTypeFP(DBBASE *pdbbase,FILE *fp,char *recordTypeName);
-epicsShareFunc long epicsShareAPI dbWriteDevice(DBBASE *pdbbase,const char *filename);
+epicsShareFunc long epicsShareAPI dbWriteRecord(
+    DBBASE *ppdbbase,const char *filename,
+    const char *precordTypename,int level);
+epicsShareFunc long epicsShareAPI dbWriteRecordFP(
+    DBBASE *ppdbbase,FILE *fp, const char *precordTypename,int level);
+epicsShareFunc long epicsShareAPI dbWriteMenu(
+    DBBASE *pdbbase,const char *filename,const char *menuName);
+epicsShareFunc long epicsShareAPI dbWriteMenuFP(
+    DBBASE *pdbbase,FILE *fp,const char *menuName);
+epicsShareFunc long epicsShareAPI dbWriteRecordType(
+    DBBASE *pdbbase,const char *filename,const char *recordTypeName);
+epicsShareFunc long epicsShareAPI dbWriteRecordTypeFP(
+    DBBASE *pdbbase,FILE *fp,const char *recordTypeName);
+epicsShareFunc long epicsShareAPI dbWriteDevice(
+    DBBASE *pdbbase,const char *filename);
 epicsShareFunc long epicsShareAPI dbWriteDeviceFP(DBBASE *pdbbase,FILE *fp);
-epicsShareFunc long epicsShareAPI dbWriteDriver(DBBASE *pdbbase,const char *filename);
+epicsShareFunc long epicsShareAPI dbWriteDriver(
+    DBBASE *pdbbase,const char *filename);
 epicsShareFunc long epicsShareAPI dbWriteDriverFP(DBBASE *pdbbase,FILE *fp);
-epicsShareFunc long epicsShareAPI dbWriteBreaktable(DBBASE *pdbbase,const char *filename);
+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.*/
@@ -112,8 +122,10 @@ epicsShareFunc long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp);
 #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,char *recdesname);
+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);
@@ -121,16 +133,20 @@ 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,char *recordTypeName);
+epicsShareFunc void epicsShareAPI dbDumpRecDes(
+    DBBASE *pdbbase,const char *recordTypeName);
 /*End obsolete routines*/
 
-epicsShareFunc long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,const char *recordTypename);
+epicsShareFunc long epicsShareAPI dbFindRecordType(
+    DBENTRY *pdbentry,const char *recordTypename);
 epicsShareFunc long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbNextRecordType(DBENTRY *pdbentry);
 epicsShareFunc char * epicsShareAPI dbGetRecordTypeName(DBENTRY *pdbentry);
 epicsShareFunc int  epicsShareAPI dbGetNRecordTypes(DBENTRY *pdbentry);
-epicsShareFunc long epicsShareAPI dbPutRecordAttribute(DBENTRY *pdbentry,char *name,char*value);
-epicsShareFunc long epicsShareAPI dbGetRecordAttribute(DBENTRY *pdbentry,char *name);
+epicsShareFunc long epicsShareAPI dbPutRecordAttribute(
+    DBENTRY *pdbentry,const char *name,const char*value);
+epicsShareFunc long epicsShareAPI dbGetRecordAttribute(
+    DBENTRY *pdbentry,const char *name);
 
 epicsShareFunc long epicsShareAPI dbFirstField(DBENTRY *pdbentry,int dctonly);
 epicsShareFunc long epicsShareAPI dbNextField(DBENTRY *pdbentry,int dctonly);
@@ -141,26 +157,34 @@ epicsShareFunc char * epicsShareAPI dbGetDefault(DBENTRY *pdbentry);
 epicsShareFunc char * epicsShareAPI dbGetPrompt(DBENTRY *pdbentry);
 epicsShareFunc int epicsShareAPI dbGetPromptGroup(DBENTRY *pdbentry);
 
-epicsShareFunc long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,char *precordName);
+epicsShareFunc long epicsShareAPI dbCreateRecord(
+    DBENTRY *pdbentry,const char *precordName);
 epicsShareFunc long epicsShareAPI dbDeleteRecord(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbFreeRecords(DBBASE *pdbbase);
-epicsShareFunc long epicsShareAPI dbFindRecord(DBENTRY *pdbentry,const char *precordName);
-epicsShareFunc long epicsShareAPI dbFirstRecord(DBENTRY *pdbentry); /*first of record type*/
+epicsShareFunc long epicsShareAPI dbFindRecord(
+    DBENTRY *pdbentry,const char *precordName);
+epicsShareFunc long epicsShareAPI dbFirstRecord(
+    DBENTRY *pdbentry); /*first of record type*/
 epicsShareFunc long epicsShareAPI dbNextRecord(DBENTRY *pdbentry);
 epicsShareFunc int  epicsShareAPI dbGetNRecords(DBENTRY *pdbentry);
 epicsShareFunc char * epicsShareAPI dbGetRecordName(DBENTRY *pdbentry);
-epicsShareFunc long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry,char *newName);
-epicsShareFunc long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,char *newRecordName,int overWriteOK);
+epicsShareFunc long epicsShareAPI dbRenameRecord(
+    DBENTRY *pdbentry,const char *newName);
+epicsShareFunc long epicsShareAPI dbCopyRecord(
+    DBENTRY *pdbentry,const char *newRecordName,int overWriteOK);
 
 epicsShareFunc long epicsShareAPI dbVisibleRecord(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbInvisibleRecord(DBENTRY *pdbentry);
 epicsShareFunc int epicsShareAPI dbIsVisibleRecord(DBENTRY *pdbentry);
 
-epicsShareFunc long epicsShareAPI dbFindField(DBENTRY *pdbentry,const char *pfieldName);
+epicsShareFunc long epicsShareAPI dbFindField(
+    DBENTRY *pdbentry,const char *pfieldName);
 epicsShareFunc int epicsShareAPI dbFoundField(DBENTRY *pdbentry);
 epicsShareFunc char * epicsShareAPI dbGetString(DBENTRY *pdbentry);
-epicsShareFunc long epicsShareAPI dbPutString(DBENTRY *pdbentry,char *pstring);
-epicsShareFunc char * epicsShareAPI dbVerify(DBENTRY *pdbentry,char *pstring);
+epicsShareFunc long epicsShareAPI dbPutString(
+    DBENTRY *pdbentry,const char *pstring);
+epicsShareFunc char * epicsShareAPI dbVerify(
+    DBENTRY *pdbentry,const char *pstring);
 epicsShareFunc char * epicsShareAPI dbGetRange(DBENTRY *pdbentry);
 epicsShareFunc int  epicsShareAPI dbIsDefaultValue(DBENTRY *pdbentry);
 
@@ -170,28 +194,38 @@ epicsShareFunc long epicsShareAPI dbFindInfo(DBENTRY *pdbentry,const char *name)
 epicsShareFunc long epicsShareAPI dbDeleteInfo(DBENTRY *pdbentry);
 epicsShareFunc const char * epicsShareAPI dbGetInfoName(DBENTRY *pdbentry);
 epicsShareFunc const char * epicsShareAPI dbGetInfoString(DBENTRY *pdbentry);
-epicsShareFunc long epicsShareAPI dbPutInfoString(DBENTRY *pdbentry,const char *string);
-epicsShareFunc long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, void *pointer);
+epicsShareFunc long epicsShareAPI dbPutInfoString(
+    DBENTRY *pdbentry,const char *string);
+epicsShareFunc long epicsShareAPI dbPutInfoPointer(
+    DBENTRY *pdbentry, void *pointer);
 epicsShareFunc const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry);
-epicsShareFunc const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry,const char *name);
-epicsShareFunc long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string);
+epicsShareFunc const char * epicsShareAPI dbGetInfo(
+    DBENTRY *pdbentry,const char *name);
+epicsShareFunc long epicsShareAPI dbPutInfo(
+    DBENTRY *pdbentry,const char *name,const char *string);
 
-epicsShareFunc brkTable * epicsShareAPI dbFindBrkTable(DBBASE *pdbbase,char *name);
+epicsShareFunc brkTable * epicsShareAPI dbFindBrkTable(
+    DBBASE *pdbbase,const char *name);
 
-epicsShareFunc dbMenu * epicsShareAPI dbFindMenu(DBBASE *pdbbase,char *name);
+epicsShareFunc dbMenu * epicsShareAPI dbFindMenu(
+    DBBASE *pdbbase,const char *name);
 epicsShareFunc char ** epicsShareAPI dbGetMenuChoices(DBENTRY *pdbentry);
 epicsShareFunc int  epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbPutMenuIndex(DBENTRY *pdbentry,int index);
 epicsShareFunc int  epicsShareAPI dbGetNMenuChoices(DBENTRY *pdbentry);
-epicsShareFunc char * epicsShareAPI dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index);
-epicsShareFunc int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, char *choice);
+epicsShareFunc char * epicsShareAPI dbGetMenuStringFromIndex(
+    DBENTRY *pdbentry, int index);
+epicsShareFunc int epicsShareAPI dbGetMenuIndexFromString(
+    DBENTRY *pdbentry, const char *choice);
 
 epicsShareFunc int  epicsShareAPI dbAllocForm(DBENTRY *pdbentry);
 epicsShareFunc long  epicsShareAPI dbFreeForm(DBENTRY *pdbentry);
 epicsShareFunc char  ** epicsShareAPI dbGetFormPrompt(DBENTRY *pdbentry);
 epicsShareFunc char  ** epicsShareAPI dbGetFormValue(DBENTRY *pdbentry);
-epicsShareFunc long  epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value);
-epicsShareFunc char  ** epicsShareAPI dbVerifyForm(DBENTRY *pdbentry,char **value);
+epicsShareFunc long  epicsShareAPI dbPutForm(
+    DBENTRY *pdbentry,char **value);
+epicsShareFunc char  ** epicsShareAPI dbVerifyForm(
+    DBENTRY *pdbentry,char **value);
 epicsShareFunc char * epicsShareAPI dbGetRelatedField(DBENTRY *pdbentry);
 
 epicsShareFunc int  epicsShareAPI dbGetNLinks(DBENTRY *pdbentry);
@@ -202,15 +236,22 @@ epicsShareFunc long epicsShareAPI dbCvtLinkToPvlink(DBENTRY *pdbentry);
 
 /*dump routines*/
 epicsShareFunc void epicsShareAPI dbDumpPath(DBBASE *pdbbase);
-epicsShareFunc void epicsShareAPI dbDumpRecord(DBBASE *pdbbase,char *precordTypename,int level);
-epicsShareFunc void epicsShareAPI dbDumpMenu(DBBASE *pdbbase,char *menuName);
-epicsShareFunc void epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,char *recordTypeName);
-epicsShareFunc void epicsShareAPI dbDumpFldDes(DBBASE *pdbbase,char *recordTypeName,char *fname);
-epicsShareFunc void epicsShareAPI dbDumpDevice(DBBASE *pdbbase,char *recordTypeName);
+epicsShareFunc void epicsShareAPI dbDumpRecord(
+    DBBASE *pdbbase,const char *precordTypename,int level);
+epicsShareFunc void epicsShareAPI dbDumpMenu(
+    DBBASE *pdbbase,const char *menuName);
+epicsShareFunc void epicsShareAPI dbDumpRecordType(
+    DBBASE *pdbbase,const char *recordTypeName);
+epicsShareFunc void epicsShareAPI dbDumpFldDes(
+    DBBASE *pdbbase,const char *recordTypeName,const char *fname);
+epicsShareFunc void epicsShareAPI dbDumpDevice(
+    DBBASE *pdbbase,const char *recordTypeName);
 epicsShareFunc void epicsShareAPI dbDumpDriver(DBBASE *pdbbase);
-epicsShareFunc void epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase,char *name);
+epicsShareFunc void epicsShareAPI dbDumpBreaktable(
+    DBBASE *pdbbase,const char *name);
 epicsShareFunc void epicsShareAPI dbPvdDump(DBBASE *pdbbase,int verbose);
-epicsShareFunc void epicsShareAPI dbReportDeviceConfig(DBBASE *pdbbase,FILE *report);
+epicsShareFunc void epicsShareAPI dbReportDeviceConfig(
+    DBBASE *pdbbase,FILE *report);
 
 /* Misc useful routines*/
 /*general purpose allocation routines to invoke calloc and malloc	*/
diff --git a/src/dbStatic/dbStaticNoRun.c b/src/dbStatic/dbStaticNoRun.c
index 9fe66e759..a77548724 100644
--- a/src/dbStatic/dbStaticNoRun.c
+++ b/src/dbStatic/dbStaticNoRun.c
@@ -32,7 +32,7 @@ of this distribution.
 #include "dbStaticPvt.h"
  
 
-long dbAllocRecord(DBENTRY *pdbentry,char *precordName)
+long dbAllocRecord(DBENTRY *pdbentry,const char *precordName)
 {
     dbRecordType	*pdbRecordType = pdbentry->precordType;
     dbRecordNode	*precnode = pdbentry->precnode;
@@ -286,7 +286,7 @@ char *dbGetStringNum(DBENTRY *pdbentry)
     return((char *)pap[pflddes->indRecordType]);
 }
 
-long dbPutStringNum(DBENTRY *pdbentry,char *pstring)
+long dbPutStringNum(DBENTRY *pdbentry,const char *pstring)
 {
     dbRecordNode *precnode = pdbentry->precnode;
     dbFldDes  	*pflddes = pdbentry->pflddes;
diff --git a/src/dbStatic/dbStaticPvt.h b/src/dbStatic/dbStaticPvt.h
index e83358a06..3235e16e1 100644
--- a/src/dbStatic/dbStaticPvt.h
+++ b/src/dbStatic/dbStaticPvt.h
@@ -39,14 +39,14 @@ void dbFreePath(DBBASE *pdbbase);
 int dbIsMacroOk(DBENTRY *pdbentry);
 
 /*The following routines have different versions for run-time no-run-time*/
-long dbAllocRecord(DBENTRY *pdbentry,char *precordName);
+long dbAllocRecord(DBENTRY *pdbentry,const char *precordName);
 long dbFreeRecord(DBENTRY *pdbentry);
 
 long dbGetFieldAddress(DBENTRY *pdbentry);
 char *dbRecordName(DBENTRY *pdbentry);
 
 char *dbGetStringNum(DBENTRY *pdbentry);
-long dbPutStringNum(DBENTRY *pdbentry,char *pstring);
+long dbPutStringNum(DBENTRY *pdbentry,const char *pstring);
 
 /* The following is for path */
 typedef struct dbPathNode {
@@ -64,7 +64,7 @@ typedef struct{
 int dbPvdTableSize(int size);
 extern int dbStaticDebug;
 void	dbPvdInitPvt(DBBASE *pdbbase);
-PVDENTRY *dbPvdFind(DBBASE *pdbbase,char *name,int lenname);
+PVDENTRY *dbPvdFind(DBBASE *pdbbase,const char *name,int lenname);
 PVDENTRY *dbPvdAdd(DBBASE *pdbbase,dbRecordType *precordType,dbRecordNode *precnode);
 void dbPvdDelete(DBBASE *pdbbase,dbRecordNode *precnode);
 void dbPvdFreeMem(DBBASE *pdbbase);
diff --git a/src/dbStatic/dbStaticRun.c b/src/dbStatic/dbStaticRun.c
index aac6656a6..b566c8f02 100644
--- a/src/dbStatic/dbStaticRun.c
+++ b/src/dbStatic/dbStaticRun.c
@@ -145,7 +145,7 @@ static void doubleToString(double value,char *preturn)
 }
 
 
-long dbAllocRecord(DBENTRY *pdbentry,char *precordName)
+long dbAllocRecord(DBENTRY *pdbentry,const char *precordName)
 {
     dbRecordType	*pdbRecordType = pdbentry->precordType;
     dbRecordNode	*precnode = pdbentry->precnode;
@@ -519,7 +519,7 @@ char *dbGetStringNum(DBENTRY *pdbentry)
     return (message);
 }
 
-long dbPutStringNum(DBENTRY *pdbentry,char *pstring)
+long dbPutStringNum(DBENTRY *pdbentry,const char *pstring)
 {
     dbFldDes  	*pflddes = pdbentry->pflddes;
     void	*pfield = pdbentry->pfield;
diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c
index 5dce81be5..20ff21a0c 100644
--- a/src/libCom/calc/postfix.c
+++ b/src/libCom/calc/postfix.c
@@ -254,9 +254,9 @@ static struct expression_element	elements[] = {
  * find the pointer to an entry in the element table
  */
 static int find_element(pbuffer,pelement,pno_bytes)
- register char	*pbuffer;
- register struct expression_element	**pelement;
- register short	*pno_bytes;
+ char	*pbuffer;
+ struct expression_element	**pelement;
+ short	*pno_bytes;
  {
 
  	/* compare the string to each element in the element table */
@@ -278,9 +278,9 @@ static int find_element(pbuffer,pelement,pno_bytes)
  * get an expression element
  */
 static int get_element(pinfix,pelement,pno_bytes)
-register char	*pinfix;
-register struct expression_element	**pelement;
-register short		*pno_bytes;
+char	*pinfix;
+struct expression_element	**pelement;
+short		*pno_bytes;
 {
 
 	/* get the next expression element from the infix expression */
@@ -303,19 +303,26 @@ register short		*pno_bytes;
  *
  * convert an infix expression to a postfix expression
  */
-long epicsShareAPI postfix(char *pinfix,char *ppostfix,short *perror)
+#define MAX_POSTFIX_SIZE 100
+long epicsShareAPI postfix(const char *pin,char *ppostfix,short *perror)
 {
 	short		no_bytes;
-	register short	operand_needed;
-	register short	new_expression;
+	short	operand_needed;
+	short	new_expression;
 	struct expression_element	stack[80];
 	struct expression_element	*pelement;
-	register struct expression_element	*pstacktop;
+	struct expression_element	*pstacktop;
 	double		constant;
-	register char   *pposthold, *pc;	
+	char   *pposthold, *pc;	
 	char in_stack_pri, in_coming_pri, code;
 	char           *ppostfixStart = ppostfix;
+        char infix[MAX_POSTFIX_SIZE];
+        char *pinfix = &infix[0];
+        int len;
 
+        len = strlen(pin);
+        if(len>=MAX_POSTFIX_SIZE) return(-1);
+        strcpy(infix,pin);
 	/* convert infix expression to upper case */
 	for (pc=pinfix; *pc; pc++) {
 		if (islower(*pc)) *pc = toupper(*pc);
diff --git a/src/libCom/calc/postfix.h b/src/libCom/calc/postfix.h
index 2f7a87e21..ab61216df 100644
--- a/src/libCom/calc/postfix.h
+++ b/src/libCom/calc/postfix.h
@@ -40,7 +40,7 @@
 #include "shareLib.h"
 
 epicsShareFunc long epicsShareAPI 
-	postfix (char *pinfix, char *ppostfix, short *perror);
+	postfix (const char *pinfix, char *ppostfix, short *perror);
 
 epicsShareFunc long epicsShareAPI 
 	calcPerform(double *parg, double *presult, char  *post);
diff --git a/src/libCom/calc/sCalcPostfix.c b/src/libCom/calc/sCalcPostfix.c
index 7bef588e2..28eca9d0c 100644
--- a/src/libCom/calc/sCalcPostfix.c
+++ b/src/libCom/calc/sCalcPostfix.c
@@ -278,9 +278,9 @@ static int strncasecmpPrivate(char *s1, char *s2, size_t n)
  * find the pointer to an entry in the element table
  */
 static int find_element(pbuffer, pelement, pno_bytes, parg)
- register char	*pbuffer;
- register struct expression_element	**pelement;
- register short	*pno_bytes, *parg;
+ char	*pbuffer;
+ struct expression_element	**pelement;
+ short	*pno_bytes, *parg;
  {
 	*parg = 0;
 
@@ -317,9 +317,9 @@ static int find_element(pbuffer, pelement, pno_bytes, parg)
  * get an expression element
  */
 static int get_element(pinfix, pelement, pno_bytes, parg)
-register char	*pinfix;
-register struct expression_element	**pelement;
-register short	*pno_bytes, *parg;
+char	*pinfix;
+struct expression_element	**pelement;
+short	*pno_bytes, *parg;
 {
 
 	/* get the next expression element from the infix expression */
@@ -341,7 +341,7 @@ register short	*pno_bytes, *parg;
 
 #if OVERRIDESTDCALC
 /* Override standard EPICS expression evaluator (if we're loaded after it). */
-long epicsShareAPI postfix(char *pinfix,char *ppostfix,short *perror)
+long epicsShareAPI postfix(const char *pinfix,char *ppostfix,short *perror)
 {
 	char *my_ppostfix = NULL, *s, *d;
 	long retval;
@@ -365,22 +365,28 @@ long epicsShareAPI postfix(char *pinfix,char *ppostfix,short *perror)
  *
  * convert an infix expression to a postfix expression
  */
-long epicsShareAPI sCalcPostfix(char *pinfix, char **pp_postfix, short *perror)
+#define MAX_POSTFIX_SIZE 100
+long epicsShareAPI sCalcPostfix(const char *pin, char **pp_postfix, short *perror)
 {
 	short no_bytes;
-	register short operand_needed;
-	register short new_expression;
+	short operand_needed;
+	short new_expression;
 	struct expression_element stack[80];
 	struct expression_element *pelement;
-	register struct expression_element *pstacktop;
+	struct expression_element *pstacktop;
 	double constant;
-	register char c, *pposthold;	
+	char c, *pposthold;	
 	char in_stack_pri, in_coming_pri, code;
 	char *ppostfix, *ppostfixStart;
 	short arg;
+        char infix[MAX_POSTFIX_SIZE];
+        char *pinfix = &infix[0];
+        int len;
 
 	if (sCalcPostfixDebug) printf("sCalcPostfix: entry\n");
-
+        len = strlen(pin);
+        if(len>=MAX_POSTFIX_SIZE) return(-1);
+        strcpy(infix,pin);
 	/* Allocate a buffer for the postfix expression. */
 	if (*pp_postfix) free(*pp_postfix);	/* Free old buffer. */
 	ppostfix = calloc(5*strlen(pinfix)+7, 1);
diff --git a/src/libCom/calc/sCalcPostfix.h b/src/libCom/calc/sCalcPostfix.h
index 8dce9b4f6..b14b97e19 100644
--- a/src/libCom/calc/sCalcPostfix.h
+++ b/src/libCom/calc/sCalcPostfix.h
@@ -37,7 +37,7 @@
 #define		BAD_EXPRESSION	0
 #define		END_STACK	127
 
-epicsShareFunc long epicsShareAPI sCalcPostfix (char *pinfix, 
+epicsShareFunc long epicsShareAPI sCalcPostfix (const char *pinfix, 
         char **pp_postfix, short *perror);
 
 epicsShareFunc long epicsShareAPI