[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)'.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 825b92c1cfce0c8e0cc0d44c28fd00f8300d542a..b33ca4382402f79ca8db3327d32166aea8b82653 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+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)'.
+
 2005-11-14 Paul Jakma <paul.jakma@sun.com>
 
        * ospfd.c: (ospf_new) stub-shutdown should just default to

diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h
index c714a15c7dee54c7e80c1010d98fc62c0815ed64..f0357a482421c367d2605aed324c0676fa0017b0 100644 (file)
--- 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) \