From 1b379f1fa8aad118c2bb45e1ae1034d0ae9d58d6 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 29 Feb 2000 19:34:40 +0000 Subject: [PATCH] get rid of warnings --- src/rec/aaiRecord.c | 10 +++------- src/rec/aaoRecord.c | 8 ++------ src/rec/boRecord.c | 1 - src/rec/calcoutRecord.c | 1 - src/rec/seqRecord.c | 1 - src/rec/subRecord.c | 2 ++ 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/rec/aaiRecord.c b/src/rec/aaiRecord.c index 4f97c63de..d32b6ec0f 100644 --- a/src/rec/aaiRecord.c +++ b/src/rec/aaiRecord.c @@ -48,8 +48,8 @@ #include "epicsPrint.h" #include "alarm.h" +#include "tsStamp.h" #include "dbAccess.h" -#include "dbFldTypes.h" #include "dbScan.h" #include "dbEvent.h" #include "devSup.h" @@ -308,13 +308,9 @@ static long readValue(paai) /* Call dev support */ status=(*pdset->read_aai)(paai); return(status); - } else { - status=-1; - recGblSetSevr(paai,SOFT_ALARM,INVALID_ALARM); - return(status); } - recGblSetSevr(paai,SIMM_ALARM,paai->sims); - + status=-1; + recGblSetSevr(paai,SIMM_ALARM,INVALID_ALARM); return(status); } diff --git a/src/rec/aaoRecord.c b/src/rec/aaoRecord.c index 473862e1e..6efab7f27 100644 --- a/src/rec/aaoRecord.c +++ b/src/rec/aaoRecord.c @@ -303,13 +303,9 @@ static long writeValue(paao) /* Call dev support */ status=(*pdset->write_aao)(paao); return(status); - } else { - status=-1; - recGblSetSevr(paao,SOFT_ALARM,INVALID_ALARM); - return(status); } - recGblSetSevr(paao,SIMM_ALARM,paao->sims); - + status=-1; + recGblSetSevr(paao,SIMM_ALARM,INVALID_ALARM); return(status); } diff --git a/src/rec/boRecord.c b/src/rec/boRecord.c index 6ec60651a..99daaf44d 100644 --- a/src/rec/boRecord.c +++ b/src/rec/boRecord.c @@ -233,7 +233,6 @@ static long process(pbo) { struct bodset *pdset = (struct bodset *)(pbo->dset); long status=0; - int wait_time; unsigned char pact=pbo->pact; if( (pdset==NULL) || (pdset->write_bo==NULL) ) { diff --git a/src/rec/calcoutRecord.c b/src/rec/calcoutRecord.c index 575be71f5..d0f43450c 100644 --- a/src/rec/calcoutRecord.c +++ b/src/rec/calcoutRecord.c @@ -223,7 +223,6 @@ static long process(pcalc) struct calcoutRecord *pcalc; { struct rpvtStruct *prpvt = (struct rpvtStruct *)pcalc->rpvt; - int wdDelay; short doOutput = 0; diff --git a/src/rec/seqRecord.c b/src/rec/seqRecord.c index e9ab8389b..6bb8578db 100644 --- a/src/rec/seqRecord.c +++ b/src/rec/seqRecord.c @@ -301,7 +301,6 @@ int processNextLink(pseq) seqRecord *pseq; { callbackSeq *pcb = (callbackSeq *) (pseq->dpvt); - int wdDelay; if (seqRecDebug > 5) printf("processNextLink(%s) looking for work to do, index = %d\n", pseq->name, pcb->index); diff --git a/src/rec/subRecord.c b/src/rec/subRecord.c index 6de2e76ac..496530022 100644 --- a/src/rec/subRecord.c +++ b/src/rec/subRecord.c @@ -57,6 +57,8 @@ #include "epicsPrint.h" #include "registry.h" #include "alarm.h" +#include "callback.h" +#include "cantProceed.h" #include "dbAccess.h" #include "epicsPrint.h" #include "dbEvent.h"