From 8bbb24709382f1c48d072669bd4d34b6745e0b5c Mon Sep 17 00:00:00 2001
From: Jonathan Hanks <jonathan.hanks@ligo.org>
Date: Tue, 10 Nov 2020 14:12:55 -0800
Subject: [PATCH] Minor cleanups to the epics sequencer.
* getCAIndex did not always return a value.
* initializing filterTable was doing a overflow, fixed now.
---
src/epics/seq/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/epics/seq/main.c b/src/epics/seq/main.c
index f604fee70..efe12884a 100644
--- a/src/epics/seq/main.c
+++ b/src/epics/seq/main.c
@@ -2339,7 +2339,7 @@ void nullCACallback(struct event_handler_args args) {}
int getCAIndex(char *entry, ADDRESS *addr) {
int ii = 0;
- if (!entry || !addr) return;
+ if (!entry || !addr) return 1;
for (ii = 0; ii < chNum; ++ii) {
if (strcmp(cdTable[ii].chname, entry) == 0) {
*addr = ii;
@@ -2828,8 +2828,8 @@ void setupCASDF()
for (ii = 0; ii < SDF_MAX_CHANS; ++ii) {
bzero((void *)&(cdTableP[ii]), sizeof(cdTableP[ii]));
}
- for (ii = 0; ii < 1000; ++ii) {
- bzero((void *)&(filterTable[1000]), sizeof(filterTable[ii]));
+ for (ii = 0; ii < SDF_MAX_FMSIZE; ++ii) {
+ bzero((void *)&(filterTable[ii]), sizeof(filterTable[ii]));
}
for (ii = 0; ii < SDF_ERR_TSIZE; ++ii) {
bzero((void *)&(setErrTable[ii]), sizeof(setErrTable[ii]));
--
GitLab