diff mbox series

[COMMITTED] checkpoints: Fix WAIT/WAKE macros

Message ID 20211201112059.8173-1-chrubis@suse.cz
State Accepted
Headers show
Series [COMMITTED] checkpoints: Fix WAIT/WAKE macros | expand

Commit Message

Cyril Hrubis Dec. 1, 2021, 11:20 a.m. UTC 
There shouldn't be semicolons there in the first place and
the WAKE_AND_WAIT() should have been wrapped in do { } while (0).

This fixes the usage of the macros in if () conditions with a single
line as:

	if (foo)
		TST_CHECKPOINT_WAKE_AND_WAIT(0);

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 include/tst_checkpoint.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/include/tst_checkpoint.h b/include/tst_checkpoint.h
index 5c8067d0d..1b6911d73 100644
--- a/include/tst_checkpoint.h
+++ b/include/tst_checkpoint.h
@@ -8,20 +8,21 @@ 
 #include "tst_checkpoint_fn.h"
 
 #define TST_CHECKPOINT_WAIT(id) \
-        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, 0);
+        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, 0)
 
 #define TST_CHECKPOINT_WAIT2(id, msec_timeout) \
-        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, msec_timeout);
+        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, msec_timeout)
 
 #define TST_CHECKPOINT_WAKE(id) \
-        tst_safe_checkpoint_wake(__FILE__, __LINE__, NULL, id, 1);
+        tst_safe_checkpoint_wake(__FILE__, __LINE__, NULL, id, 1)
 
 #define TST_CHECKPOINT_WAKE2(id, nr_wake) \
-        tst_safe_checkpoint_wake(__FILE__, __LINE__, NULL, id, nr_wake);
+        tst_safe_checkpoint_wake(__FILE__, __LINE__, NULL, id, nr_wake)
 
-#define TST_CHECKPOINT_WAKE_AND_WAIT(id) \
+#define TST_CHECKPOINT_WAKE_AND_WAIT(id) do { \
         tst_safe_checkpoint_wake(__FILE__, __LINE__, NULL, id, 1); \
-        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, 0);
+        tst_safe_checkpoint_wait(__FILE__, __LINE__, NULL, id, 0); \
+} while (0)
 
 extern const char *tst_ipc_path;