[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2 3/7] chardev: Use goto/label instead of do/brea
From: |
Eric Blake |
Subject: |
[Qemu-trivial] [PATCH v2 3/7] chardev: Use goto/label instead of do/break/while(0) |
Date: |
Fri, 1 Dec 2017 17:24:29 -0600 |
Use of a do/while(0) control flow in order to permit an early break
is an unusual paradigm, and triggers a false positive with a planned
future syntax check against 'while (0);'. Rewrite the code to use a
goto instead. This patch temporarily keeps an extra level of
indentation to highlight the change; the next patch cleans it up.
Signed-off-by: Eric Blake <address@hidden>
---
chardev/char-serial.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 2f8f83821d..10162f9fa3 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -64,9 +64,14 @@ static void tty_serial_init(int fd, int speed,
#endif
tcgetattr(fd, &tty);
-#define check_speed(val) if (speed <= val) { spd = B##val; break; }
+#define check_speed(val) \
+ if (speed <= val) { \
+ spd = B##val; \
+ goto done; \
+ }
+
speed = speed * 10 / 11;
- do {
+ {
check_speed(50);
check_speed(75);
check_speed(110);
@@ -125,8 +130,10 @@ static void tty_serial_init(int fd, int speed,
check_speed(4000000);
#endif
spd = B115200;
- } while (0);
+ }
+#undef check_speed
+ done:
cfsetispeed(&tty, spd);
cfsetospeed(&tty, spd);
--
2.14.3
- [Qemu-trivial] [PATCH v2 0/7] macro do/while (0) cleanup, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 1/7] net: Drop unusual use of do { } while (0);, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 4/7] chardev: Clean up previous patch indentation, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 2/7] mips: Tweak location of '; ' in macros, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 5/7] tests: Avoid 'do/while(false); ' in vhost-user-bridge, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 3/7] chardev: Use goto/label instead of do/break/while(0),
Eric Blake <=
- [Qemu-trivial] [PATCH v2 7/7] checkpatch: Enforce proper do/while (0) style, Eric Blake, 2017/12/01
- [Qemu-trivial] [PATCH v2 6/7] maint: Fix macros with broken 'do/while(0); ' usage, Eric Blake, 2017/12/01