diff options
| author | ajs <ajs> | 2005-11-16 19:33:22 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2005-11-16 19:33:22 +0000 |
| commit | 0c76319149f154632de54056a34a3c6bbf893dfd (patch) | |
| tree | 14436ab2416253e39502cccb2b3a6645e1bb6d23 /ospfd/ospf_ism.h | |
| parent | c9566ae0f0aa68ff16178a7fcfbd311f86a7d22b (diff) | |
| download | quagga-0c76319149f154632de54056a34a3c6bbf893dfd.tar.bz2 quagga-0c76319149f154632de54056a34a3c6bbf893dfd.tar.xz | |
[ospfd] Make OSPF_ISM_TIMER_OFF macro safer.
2005-11-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_ism.h: (OSPF_ISM_TIMER_OFF) Improve macro syntax by enclosing
in 'do {...} while(0)'.
Diffstat (limited to 'ospfd/ospf_ism.h')
| -rw-r--r-- | ospfd/ospf_ism.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h index c714a15c..f0357a48 100644 --- a/ospfd/ospf_ism.h +++ b/ospfd/ospf_ism.h @@ -90,11 +90,13 @@ /* Macro for OSPF ISM timer turn off. */ #define OSPF_ISM_TIMER_OFF(X) \ - if (X) \ - { \ - thread_cancel (X); \ - (X) = NULL; \ - } + do { \ + if (X) \ + { \ + thread_cancel (X); \ + (X) = NULL; \ + } \ + } while (0) /* Macro for OSPF schedule event. */ #define OSPF_ISM_EVENT_SCHEDULE(I,E) \ |