epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Clean up warnings from gcc 4.6.3

Browse Source
This commit is contained in:
Andrew Johnson
2012-07-07 15:54:31 -05:00
parent 2559e1a3b7
commit 62727dcba6
17 changed files with 46 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/std/dev/devEventSoft.c
View File

@@ -71,9 +71,8 @@ static long read_event(eventRecord *prec)
long status;
char newEvent[MAX_STRING_SIZE];
if (prec->inp.type != CONSTANT)
{
status = dbGetLinkValue(&prec->inp, DBR_STRING, newEvent, 0, 0);
if (prec->inp.type != CONSTANT) {
status = dbGetLink(&prec->inp, DBR_STRING, newEvent, 0, 0);
if (status) return status;
if (strcmp(newEvent, prec->val) != 0) {
strcpy(prec->val, newEvent);

10
src/std/dev/devHistogramSoft.c
View File

@@ -52,8 +52,6 @@ epicsExportAddress(dset,devHistogramSoft);
static long init_record(histogramRecord *prec)
{
long status = 0;
/* histogram.svl must be a CONSTANT or a PV_LINK or a DB_LINK or a CA_LINK*/
switch (prec->svl.type) {
case (CONSTANT) :
@@ -69,13 +67,11 @@ static long init_record(histogramRecord *prec)
"devHistogramSoft (init_record) Illegal SVL field");
return(S_db_badField);
}
return(status);
return 0;
}
static long read_histogram(histogramRecord *prec)
{
long status;
status = dbGetLink(&prec->svl,DBR_DOUBLE, &prec->sgnl,0,0);
return(0); /*add count*/
dbGetLink(&prec->svl, DBR_DOUBLE, &prec->sgnl, 0, 0);
return 0; /*add count*/
}

8
src/std/dev/devLoSoft.c
View File

@@ -48,13 +48,11 @@ epicsExportAddress(dset,devLoSoft);
static long init_record(longoutRecord *prec)
{
return(0);
return 0;
} /* end init_record() */
static long write_longout(longoutRecord *prec)
{
long status;
status = dbPutLink(&prec->out,DBR_LONG, &prec->val,1);
return(0);
dbPutLink(&prec->out,DBR_LONG, &prec->val,1);
return 0;
}

6
src/std/dev/devMbboDirectSoft.c
View File

@@ -59,8 +59,6 @@ static long init_record(mbboDirectRecord *prec)
static long write_mbbo(mbboDirectRecord *prec)
{
long status;
status = dbPutLink(&prec->out,DBR_USHORT,&prec->val,1);
return(0);
dbPutLink(&prec->out,DBR_USHORT,&prec->val,1);
return 0;
}

5
src/std/dev/devMbboDirectSoftRaw.c
View File

@@ -62,10 +62,9 @@ static long init_record(mbboDirectRecord *prec)
static long write_mbbo(mbboDirectRecord *prec)
{
long status;
unsigned long data;
data = prec->rval & prec->mask;
status = dbPutLink(&prec->out,DBR_LONG, &data,1);
return(0);
dbPutLink(&prec->out,DBR_LONG, &data,1);
return 0;
}

12
src/std/dev/devMbboSoft.c
View File

@@ -49,19 +49,13 @@ epicsExportAddress(dset,devMbboSoft);
static long init_record(mbboRecord *prec)
{
long status=0;
/*dont convert*/
status=2;
return status;
return 2;
} /* end init_record() */
static long write_mbbo(mbboRecord *prec)
{
long status;
status = dbPutLink(&prec->out,DBR_USHORT, &prec->val,1);
return(0);
dbPutLink(&prec->out,DBR_USHORT, &prec->val,1);
return 0;
}

13
src/std/dev/devMbboSoftRaw.c
View File

@@ -48,24 +48,19 @@ epicsExportAddress(dset,devMbboSoftRaw);
static long init_record(mbboRecord *prec)
{
long status;
/*to preserve old functionality*/
if(prec->nobt == 0) prec->mask = 0xffffffff;
if (prec->nobt == 0) prec->mask = 0xffffffff;
prec->mask <<= prec->shft;
/*dont convert*/
status = 2;
return status;
return 2;
} /* end init_record() */
static long write_mbbo(mbboRecord *prec)
{
long status;
unsigned long data;
data = prec->rval & prec->mask;
status = dbPutLink(&prec->out,DBR_LONG, &data,1);
return(0);
dbPutLink(&prec->out,DBR_LONG, &data,1);
return 0;
}