From 8d7bf52e515af8736fc8777b914d3b5681f0fce0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 9 Dec 2016 11:17:43 -0600 Subject: [PATCH 1/3] One more cppcheck issue fixed --- src/dbStatic/dbLexRoutines.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/dbStatic/dbLexRoutines.c b/src/dbStatic/dbLexRoutines.c index 78a3cc39c..db95cc61f 100644 --- a/src/dbStatic/dbLexRoutines.c +++ b/src/dbStatic/dbLexRoutines.c @@ -229,24 +229,25 @@ static long dbReadCOM(DBBASE **ppdbbase,const char *filename, FILE *fp, } } pinputFile = dbCalloc(1,sizeof(inputFile)); - if(filename) { - pinputFile->filename = macEnvExpand(filename); + if (filename) { + pinputFile->filename = macEnvExpand(filename); } - if(!fp) { - FILE *fp1; + if (!fp) { + FILE *fp1 = 0; - if(pinputFile->filename) pinputFile->path = dbOpenFile(pdbbase,pinputFile->filename,&fp1); - if(!pinputFile->filename || !fp1) { - errPrintf(0,__FILE__, __LINE__, - "dbRead opening file %s",pinputFile->filename); - free((void *)pinputFile->filename); - free((void *)pinputFile); + if (pinputFile->filename) + pinputFile->path = dbOpenFile(pdbbase, pinputFile->filename, &fp1); + if (!pinputFile->filename || !fp1) { + errPrintf(0, __FILE__, __LINE__, + "dbRead opening file %s",pinputFile->filename); + free(pinputFile->filename); + free(pinputFile); status = -1; goto cleanup; - } - pinputFile->fp = fp1; + } + pinputFile->fp = fp1; } else { - pinputFile->fp = fp; + pinputFile->fp = fp; } pinputFile->line_num = 0; pinputFileNow = pinputFile; From 5097ac32301b5fe875c73e7754058bd58c586de4 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 9 Dec 2016 13:48:55 -0600 Subject: [PATCH 2/3] Set SNAPSHOT for 3.14.12.6 --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index decbf9280..8a8b9610b 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -37,10 +37,10 @@ EPICS_PATCH_LEVEL = 6 #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV #EPICS_DEV_SNAPSHOT=-rc1 -EPICS_DEV_SNAPSHOT=-rc1-DEV +#EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -#EPICS_DEV_SNAPSHOT= +EPICS_DEV_SNAPSHOT= # No changes should be needed below here From 260bc64b59422d7cbb4280ada64bf6461ce2d425 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 9 Dec 2016 13:50:17 -0600 Subject: [PATCH 3/3] Set SNAPSHOT back to -DEV --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 8a8b9610b..e5f7e58b4 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -31,7 +31,7 @@ EPICS_MODIFICATION = 12 EPICS_PATCH_LEVEL = 6 # This will end in -DEV between official releases -#EPICS_DEV_SNAPSHOT=-DEV +EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 @@ -40,7 +40,7 @@ EPICS_PATCH_LEVEL = 6 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -EPICS_DEV_SNAPSHOT= +#EPICS_DEV_SNAPSHOT= # No changes should be needed below here