diff --git a/src/dbStatic/dbReadTest.c b/src/dbStatic/dbReadTest.c index 4a2972fbe..9a78a54e3 100644 --- a/src/dbStatic/dbReadTest.c +++ b/src/dbStatic/dbReadTest.c @@ -19,6 +19,7 @@ of this distribution. #include #include #include +#include #include "dbDefs.h" #include "epicsPrint.h" diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c index b89e3942d..7cfd753fa 100644 --- a/src/dbStatic/dbStaticLib.c +++ b/src/dbStatic/dbStaticLib.c @@ -1409,7 +1409,7 @@ int dbGetPromptGroup(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; - if(!pflddes) return(NULL); + if(!pflddes) return(0); return(pflddes->promptgroup); } diff --git a/src/dbStatic/dbStaticNoRun.c b/src/dbStatic/dbStaticNoRun.c index 4eec61d55..f2090cecb 100644 --- a/src/dbStatic/dbStaticNoRun.c +++ b/src/dbStatic/dbStaticNoRun.c @@ -187,7 +187,6 @@ int dbIsDefaultValue(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; - char *endp; if(!pflddes) return(FALSE); if(!pfield) return(TRUE); @@ -244,6 +243,8 @@ int dbIsDefaultValue(DBENTRY *pdbentry) return(TRUE); return(FALSE); } + case DBF_NOACCESS: + return(TRUE); } return(FALSE); } @@ -339,7 +340,7 @@ long dbPutMenuIndex(DBENTRY *pdbentry,int index) nChoices = dbGetNMenuChoices(pdbentry); menuChoices = dbGetMenuChoices(pdbentry); - if(index<0 | index>=nChoices) return(S_dbLib_badField); + if(index<0 || index>=nChoices) return(S_dbLib_badField); dbPutStringNum(pdbentry,menuChoices[index]); return(0); } diff --git a/src/dbStatic/dbToRecordtypeH.c b/src/dbStatic/dbToRecordtypeH.c index fa3597806..f9bb17655 100644 --- a/src/dbStatic/dbToRecordtypeH.c +++ b/src/dbStatic/dbToRecordtypeH.c @@ -19,6 +19,7 @@ of this distribution. #include #include #include +#include #include "dbDefs.h" #include "epicsPrint.h"