diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-07-06 18:55:03 +0200 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2020-10-23 14:59:34 +0200 |
| commit | b3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9 (patch) | |
| tree | b5ef6dcab41d9da516a6ff044056e0faca7b35da /ospfd/ospf_ism.h | |
| parent | Merge pull request #7345 from opensourcerouting/bgp-aggr-suppress (diff) | |
| download | frr-b3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9.tar.xz frr-b3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9.zip | |
* : 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 <mjs@voltanet.io>
Diffstat (limited to 'ospfd/ospf_ism.h')
| -rw-r--r-- | ospfd/ospf_ism.h | 8 |
1 files changed, 1 insertions, 7 deletions
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) \ |