Clean up warnings from gcc 4.6.3
This commit is contained in:
@@ -576,8 +576,6 @@ static void checkAlarms(calcoutRecord *prec)
|
||||
|
||||
static void execOutput(calcoutRecord *prec)
|
||||
{
|
||||
long status;
|
||||
|
||||
/* Determine output data */
|
||||
switch(prec->dopt) {
|
||||
case calcoutDOPT_Use_VAL:
|
||||
@@ -598,12 +596,12 @@ static void execOutput(calcoutRecord *prec)
|
||||
/* Check to see what to do if INVALID */
|
||||
if (prec->nsev < INVALID_ALARM ) {
|
||||
/* Output the value */
|
||||
status = writeValue(prec);
|
||||
writeValue(prec);
|
||||
/* post output event if set */
|
||||
if (prec->epvt) postEvent(prec->epvt);
|
||||
} else switch (prec->ivoa) {
|
||||
case menuIvoaContinue_normally:
|
||||
status = writeValue(prec);
|
||||
writeValue(prec);
|
||||
/* post output event if set */
|
||||
if (prec->epvt) postEvent(prec->epvt);
|
||||
break;
|
||||
@@ -611,12 +609,11 @@ static void execOutput(calcoutRecord *prec)
|
||||
break;
|
||||
case menuIvoaSet_output_to_IVOV:
|
||||
prec->oval = prec->ivov;
|
||||
status = writeValue(prec);
|
||||
writeValue(prec);
|
||||
/* post output event if set */
|
||||
if (prec->epvt) postEvent(prec->epvt);
|
||||
break;
|
||||
default:
|
||||
status = -1;
|
||||
recGblRecordError(S_db_badField, (void *)prec,
|
||||
"calcout:process Illegal IVOA field");
|
||||
}
|
||||
|
||||
@@ -88,7 +88,6 @@ static long process(fanoutRecord *prec)
|
||||
struct link *plink;
|
||||
unsigned short state;
|
||||
short i;
|
||||
unsigned short monitor_mask;
|
||||
|
||||
prec->pact = TRUE;
|
||||
|
||||
@@ -134,7 +133,7 @@ static long process(fanoutRecord *prec)
|
||||
recGblGetTimeStamp(prec);
|
||||
/* check monitors*/
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
monitor_mask = recGblResetAlarms(prec);
|
||||
recGblResetAlarms(prec);
|
||||
/* process the forward scan link record */
|
||||
recGblFwdLink(prec);
|
||||
prec->pact=FALSE;
|
||||
|
||||
@@ -91,7 +91,6 @@ static void monitor(subRecord *);
|
||||
static long init_record(subRecord *prec, int pass)
|
||||
{
|
||||
SUBFUNCPTR psubroutine;
|
||||
long status = 0;
|
||||
struct link *plink;
|
||||
int i;
|
||||
double *pvalue;
|
||||
@@ -114,7 +113,7 @@ static long init_record(subRecord *prec, int pass)
|
||||
return S_db_BadSub;
|
||||
}
|
||||
/* invoke the initialization subroutine */
|
||||
status = (*psubroutine)(prec);
|
||||
(*psubroutine)(prec);
|
||||
}
|
||||
|
||||
if (prec->snam[0] == 0) {
|
||||
|
||||
@@ -133,7 +133,6 @@ static long init_record(waveformRecord *prec, int pass)
|
||||
static long process(waveformRecord *prec)
|
||||
{
|
||||
struct wfdset *pdset = (struct wfdset *)(prec->dset);
|
||||
long status;
|
||||
unsigned char pact=prec->pact;
|
||||
|
||||
if ((pdset==NULL) || (pdset->read_wf==NULL)) {
|
||||
@@ -144,7 +143,7 @@ static long process(waveformRecord *prec)
|
||||
|
||||
if (pact && prec->busy) return 0;
|
||||
|
||||
status=readValue(prec); /* read the new value */
|
||||
readValue(prec); /* read the new value */
|
||||
if (!pact && prec->pact) return 0;
|
||||
|
||||
prec->pact = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user