From b3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Mon, 6 Jul 2020 12:55:03 -0400 Subject: * : update signature of thread_cancel api Change thread_cancel to take a ** to an event, NULL-check before dereferencing, and NULL the caller's pointer. Update many callers to use the new signature. Signed-off-by: Mark Stapp --- ospfd/ospf_ism.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ospfd/ospf_ism.h') diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h index 67ea4c468..6c0df9a1e 100644 --- a/ospfd/ospf_ism.h +++ b/ospfd/ospf_ism.h @@ -79,13 +79,7 @@ } while (0) /* Macro for OSPF ISM timer turn off. */ -#define OSPF_ISM_TIMER_OFF(X) \ - do { \ - if (X) { \ - thread_cancel(X); \ - (X) = NULL; \ - } \ - } while (0) +#define OSPF_ISM_TIMER_OFF(X) thread_cancel(&(X)); /* Macro for OSPF schedule event. */ #define OSPF_ISM_EVENT_SCHEDULE(I, E) \ -- cgit v1.2.3