From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Jason Wang <jasowang@redhat.com>
Subject: [Qemu-trivial] [PATCH 1/3] net: Drop unusual use of do { } while (0);
Date: Thu, 30 Nov 2017 07:41:57 -0600 [thread overview]
Message-ID: <20171130134159.9697-2-eblake@redhat.com> (raw)
In-Reply-To: <20171130134159.9697-1-eblake@redhat.com>
For a couple of macros in pcnet.c, we have to provide a new scope
to avoid compiler warnings about declarations in the middle of a
switch statement that aren't in a sub-scope. But use of
'do { ... } while (0);' merely to provide that new scope is arcane
overkill, compared to just using '{ ... }'.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
hw/net/pcnet.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 654455355f..641bf2fd88 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -455,32 +455,32 @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
#define CHECK_RMD(ADDR,RES) do { \
switch (BCR_SWSTYLE(s)) { \
case 0x00: \
- do { \
+ { \
uint16_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[2] & 0xf000)!=0xf000; \
(RES) |= (rda[3] & 0xf000)!=0x0000; \
- } while (0); \
+ } \
break; \
case 0x01: \
case 0x02: \
- do { \
+ { \
uint32_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[1] & 0x0000f000L)!=0x0000f000L; \
(RES) |= (rda[2] & 0x0000f000L)!=0x00000000L; \
- } while (0); \
+ } \
break; \
case 0x03: \
- do { \
+ { \
uint32_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[0] & 0x0000f000L)!=0x00000000L; \
(RES) |= (rda[1] & 0x0000f000L)!=0x0000f000L; \
- } while (0); \
+ } \
break; \
} \
} while (0)
@@ -488,22 +488,22 @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
#define CHECK_TMD(ADDR,RES) do { \
switch (BCR_SWSTYLE(s)) { \
case 0x00: \
- do { \
+ { \
uint16_t xda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&xda[0], sizeof(xda), 0); \
(RES) |= (xda[2] & 0xf000)!=0xf000; \
- } while (0); \
+ } \
break; \
case 0x01: \
case 0x02: \
case 0x03: \
- do { \
+ { \
uint32_t xda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&xda[0], sizeof(xda), 0); \
(RES) |= (xda[1] & 0x0000f000L)!=0x0000f000L; \
- } while (0); \
+ } \
break; \
} \
} while (0)
--
2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PATCH 1/3] net: Drop unusual use of do { } while (0);
Date: Thu, 30 Nov 2017 07:41:57 -0600 [thread overview]
Message-ID: <20171130134159.9697-2-eblake@redhat.com> (raw)
In-Reply-To: <20171130134159.9697-1-eblake@redhat.com>
For a couple of macros in pcnet.c, we have to provide a new scope
to avoid compiler warnings about declarations in the middle of a
switch statement that aren't in a sub-scope. But use of
'do { ... } while (0);' merely to provide that new scope is arcane
overkill, compared to just using '{ ... }'.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
hw/net/pcnet.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 654455355f..641bf2fd88 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -455,32 +455,32 @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
#define CHECK_RMD(ADDR,RES) do { \
switch (BCR_SWSTYLE(s)) { \
case 0x00: \
- do { \
+ { \
uint16_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[2] & 0xf000)!=0xf000; \
(RES) |= (rda[3] & 0xf000)!=0x0000; \
- } while (0); \
+ } \
break; \
case 0x01: \
case 0x02: \
- do { \
+ { \
uint32_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[1] & 0x0000f000L)!=0x0000f000L; \
(RES) |= (rda[2] & 0x0000f000L)!=0x00000000L; \
- } while (0); \
+ } \
break; \
case 0x03: \
- do { \
+ { \
uint32_t rda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&rda[0], sizeof(rda), 0); \
(RES) |= (rda[0] & 0x0000f000L)!=0x00000000L; \
(RES) |= (rda[1] & 0x0000f000L)!=0x0000f000L; \
- } while (0); \
+ } \
break; \
} \
} while (0)
@@ -488,22 +488,22 @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
#define CHECK_TMD(ADDR,RES) do { \
switch (BCR_SWSTYLE(s)) { \
case 0x00: \
- do { \
+ { \
uint16_t xda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&xda[0], sizeof(xda), 0); \
(RES) |= (xda[2] & 0xf000)!=0xf000; \
- } while (0); \
+ } \
break; \
case 0x01: \
case 0x02: \
case 0x03: \
- do { \
+ { \
uint32_t xda[4]; \
s->phys_mem_read(s->dma_opaque, (ADDR), \
(void *)&xda[0], sizeof(xda), 0); \
(RES) |= (xda[1] & 0x0000f000L)!=0x0000f000L; \
- } while (0); \
+ } \
break; \
} \
} while (0)
--
2.14.3
next prev parent reply other threads:[~2017-11-30 13:42 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 13:41 [Qemu-trivial] [PATCH 0/3] macro do/while (0) cleanup Eric Blake
2017-11-30 13:41 ` [Qemu-devel] " Eric Blake
2017-11-30 13:41 ` Eric Blake [this message]
2017-11-30 13:41 ` [Qemu-devel] [PATCH 1/3] net: Drop unusual use of do { } while (0); Eric Blake
2017-11-30 16:08 ` [Qemu-trivial] " Thomas Huth
2017-11-30 16:08 ` Thomas Huth
2017-11-30 13:41 ` [Qemu-trivial] [PATCH 2/3] mips: Tweak location of ';' in macros Eric Blake
2017-11-30 13:41 ` [Qemu-devel] " Eric Blake
2017-11-30 15:33 ` [Qemu-trivial] [Qemu-devel] [PATCH 2/3] mips: Tweak location of '; ' " Philippe Mathieu-Daudé
2017-11-30 15:33 ` [Qemu-devel] [PATCH 2/3] mips: Tweak location of ';' " Philippe Mathieu-Daudé
2017-11-30 13:41 ` [Qemu-trivial] [PATCH 3/3] maint: Fix macros with broken 'do/while(0); ' usage Eric Blake
2017-11-30 13:41 ` [Qemu-devel] " Eric Blake
2017-11-30 13:41 ` [Qemu-arm] " Eric Blake
2017-11-30 13:54 ` [Qemu-trivial] " Cornelia Huck
2017-11-30 13:54 ` [Qemu-devel] " Cornelia Huck
2017-11-30 13:54 ` [Qemu-arm] " Cornelia Huck
2017-11-30 14:43 ` [Qemu-trivial] " Michael S. Tsirkin
2017-11-30 14:43 ` [Qemu-devel] " Michael S. Tsirkin
2017-11-30 14:43 ` [Qemu-arm] " Michael S. Tsirkin
2017-11-30 14:55 ` [Qemu-trivial] " Eric Blake
2017-11-30 14:55 ` [Qemu-devel] " Eric Blake
2017-11-30 14:55 ` [Qemu-arm] " Eric Blake
2017-11-30 14:56 ` [Qemu-trivial] " Dr. David Alan Gilbert
2017-11-30 14:56 ` [Qemu-devel] " Dr. David Alan Gilbert
2017-11-30 14:56 ` [Qemu-arm] " Dr. David Alan Gilbert
2017-12-04 0:45 ` [Qemu-trivial] [Qemu-ppc] " David Gibson
2017-12-04 0:45 ` [Qemu-devel] " David Gibson
2017-12-04 0:45 ` [Qemu-arm] " David Gibson
2017-11-30 14:01 ` [Qemu-trivial] [PATCH 4/3] checkpatch: Enforce proper do/while (0) style Eric Blake
2017-11-30 14:01 ` [Qemu-devel] " Eric Blake
2017-11-30 17:00 ` [Qemu-trivial] " Eric Blake
2017-11-30 17:00 ` Eric Blake
2017-12-01 7:31 ` [Qemu-trivial] " Markus Armbruster
2017-12-01 7:31 ` Markus Armbruster
2017-12-01 14:22 ` [Qemu-trivial] " Eric Blake
2017-12-01 14:22 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171130134159.9697-2-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.