diff --git a/src/dbStatic/dbExpand.c b/src/dbStatic/dbExpand.c index 4a592b81e..a5c641e0f 100644 --- a/src/dbStatic/dbExpand.c +++ b/src/dbStatic/dbExpand.c @@ -21,14 +21,13 @@ of this distribution. #include #include +#include "dbDefs.h" #include "epicsPrint.h" #include "errMdef.h" #include "dbStaticLib.h" #include "dbStaticPvt.h" #include "dbBase.h" #include "gpHash.h" -#include "osiFileName.h" -#include "dbDefs.h" DBBASE *pdbbase = NULL; @@ -44,7 +43,7 @@ int main(int argc,char **argv) char *psep; int *len; long status; - static char *pathSep = OSI_PATH_LIST_SEPARATOR; + static char *pathSep = ":"; static char *subSep = ","; /*Look for options*/ @@ -78,7 +77,7 @@ int main(int argc,char **argv) } if(argc<2 || (strncmp(argv[1],"-",1)==0)) { fprintf(stderr, - "usage:\ndbExpand -Idir -Idir" + "usage:\ndbExpand -Idir -Idir " "-S substitutions -S substitutions" " file1.dbd file2.dbd ...\n"); fprintf(stderr,"Specifying path will replace the default '.'\n"); diff --git a/src/dbStatic/dbReadTest.c b/src/dbStatic/dbReadTest.c index 044035907..1e9899b1e 100644 --- a/src/dbStatic/dbReadTest.c +++ b/src/dbStatic/dbReadTest.c @@ -20,14 +20,13 @@ of this distribution. #include #include +#include "dbDefs.h" #include "epicsPrint.h" #include "errMdef.h" #include "dbStaticLib.h" #include "dbStaticPvt.h" #include "dbBase.h" #include "gpHash.h" -#include "osiFileName.h" -#include "dbDefs.h" DBBASE *pdbbase = NULL; @@ -43,7 +42,7 @@ int main(int argc,char **argv) char *psep; int *len; long status; - static char *pathSep = OSI_PATH_LIST_SEPARATOR; + static char *pathSep = ":"; static char *subSep = ","; /*Look for options*/ @@ -87,8 +86,8 @@ int main(int argc,char **argv) dbPvdDump(pdbbase); gphDump(pdbbase->pgpHash); dbDumpMenu(pdbbase,NULL); -*/ dbDumpRecord(pdbbase,NULL,0); dbFreeBase(pdbbase); +*/ return(0); }