From 069c404d64bb225dc93ac9d73e1416b0308e2b85 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 5 Aug 1996 23:50:59 +0000
Subject: [PATCH] use ca_import_cancel()

---
 src/sequencer/seq_ca.c   | 3 +--
 src/sequencer/seq_task.c | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/sequencer/seq_ca.c b/src/sequencer/seq_ca.c
index c5433e46b..5071ba9a8 100644
--- a/src/sequencer/seq_ca.c
+++ b/src/sequencer/seq_ca.c
@@ -193,7 +193,6 @@ long seq_disconnect(SPROG *pSP)
 {
 	CHAN		*pDB;
 	STATUS		status;
-	extern int	ca_static;
 	int		i;
 	extern int	seqAuxTaskId;
 	SPROG		*pMySP; /* will be NULL if this task is not a sequencer task */
@@ -239,7 +238,7 @@ long seq_disconnect(SPROG *pSP)
 #ifdef	DEBUG_DISCONNECT
 		logMsg("seq_disconnect: ca_import_cancel\n");
 #endif	/*DEBUG_DISCONNECT*/
-		SEVCHK(ca_import_cancel(taskIdSelf(), 
+		SEVCHK(ca_import_cancel(taskIdSelf()), 
 			"seq_disconnect: ca_import_cancel() failed?");
 	}
 
diff --git a/src/sequencer/seq_task.c b/src/sequencer/seq_task.c
index 37beff042..af59e1334 100644
--- a/src/sequencer/seq_task.c
+++ b/src/sequencer/seq_task.c
@@ -360,7 +360,6 @@ SEM_ID		cleanupSem; /* indicate cleanup is finished */
 {
 	int		nss;
 	SSCB		*pSS;
-	extern int	ca_static; /* CA static variable */
 
 #ifdef	DEBUG_CLEANUP
 	logMsg("Delete %s: pSP=%d=0x%x, tid=%d\n", pSP->pProgName, pSP, pSP, tid);
@@ -416,8 +415,8 @@ SEM_ID		cleanupSem; /* indicate cleanup is finished */
 #ifdef	DEBUG_CLEANUP
 		logMsg("   ca_import_cancel(0x%x)\n", pSS->taskId);
 #endif	/*DEBUG_CLEANUP*/
-		/*ca_import_cancel(pSS->taskId);*/
-		taskVarDelete(pSS->taskId, &ca_static);
+		SEVCHK(ca_import_cancel(pSS->taskId), 
+				"CA import cancel failed!");
 	}
 
 	/* Close the log file */