epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge clang fixes from 3.14 into 3.15

Browse Source
This commit is contained in:
Andrew Johnson
2018-02-09 11:16:26 -06:00
parent 61296b8cff ac4d5c95ac
commit bf91275200
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ioc/db/dbBkpt.c
View File

@@ -410,7 +410,7 @@ long dbd(const char *record_name)
precord = addr.precord;
if (! precord->bkpt & BKPT_ON_MASK) {
if (!(precord->bkpt & BKPT_ON_MASK)) {
printf(" BKPT> No breakpoint set in this record\n");
return(S_db_bkptNotSet);
}

6
src/ioc/db/dbLock.c
View File

@@ -552,10 +552,10 @@ long dblsr(char *recordname,int level)
printf(" Not Locked\n");
} else {
printf(" thread %p",plockSet->thread_id);
if(! plockSet->precord || !plockSet->precord->name)
printf(" NULL record or record name\n");
if(! plockSet->precord)
printf(" NULL record\n");
else
printf(" record %s\n",plockSet->precord->name);
printf(" record %s\n",plockSet->precord->name);
}
if(level==0) { if(recordname) break; continue; }
for(plockRecord = (lockRecord *)ellFirst(&plockSet->lockRecordList);

3
src/ioc/misc/epicsRelease.c
View File

@@ -17,9 +17,6 @@
#define epicsExportSharedSymbols
#include "epicsRelease.h"
static const char id[] EPICS_UNUSED =
"@(#) " EPICS_VERSION_STRING ", Misc. Utilities Library" __DATE__;
epicsShareFunc int coreRelease(void)
{
printf ( "############################################################################\n" );