Patchwork Remove wrong semicolon in macro definition

login
register
mail settings
Submitter Stefan Weil
Date Sept. 13, 2010, 7:21 p.m.
Message ID <1284405717-18928-1-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/64627/
State New
Headers show

Comments

Stefan Weil - Sept. 13, 2010, 7:21 p.m.
Macros normally should not end with a semicolon,
otherwise their usage results in two statements
where only one statement was expected.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/serial.c             |    4 ++--
 tests/cris/check_swap.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Edgar Iglesias - Sept. 14, 2010, 3:19 p.m.
On Mon, Sep 13, 2010 at 09:21:57PM +0200, Stefan Weil wrote:
> Macros normally should not end with a semicolon,
> otherwise their usage results in two statements
> where only one statement was expected.

Applied



> 
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/serial.c             |    4 ++--
>  tests/cris/check_swap.c |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/serial.c b/hw/serial.c
> index 49431b2..f09ce0a 100644
> --- a/hw/serial.c
> +++ b/hw/serial.c
> @@ -101,10 +101,10 @@
>  
>  #ifdef DEBUG_SERIAL
>  #define DPRINTF(fmt, ...) \
> -do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
> +do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0)
>  #else
>  #define DPRINTF(fmt, ...) \
> -do {} while(0);
> +do {} while (0)
>  #endif
>  
>  typedef struct SerialFIFO {
> diff --git a/tests/cris/check_swap.c b/tests/cris/check_swap.c
> index 743cfc5..824a685 100644
> --- a/tests/cris/check_swap.c
> +++ b/tests/cris/check_swap.c
> @@ -41,7 +41,7 @@ do {                                                    \
>          cris_tst_mov_cc(n, z);                          \
>  	if (r != expected)                              \
>  		err();                                  \
> -} while(0);
> +} while(0)
>  
>  void check_swap(void)
>  {
> -- 
> 1.7.0.4
> 
>

Patch

diff --git a/hw/serial.c b/hw/serial.c
index 49431b2..f09ce0a 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -101,10 +101,10 @@ 
 
 #ifdef DEBUG_SERIAL
 #define DPRINTF(fmt, ...) \
-do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
+do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0)
 #else
 #define DPRINTF(fmt, ...) \
-do {} while(0);
+do {} while (0)
 #endif
 
 typedef struct SerialFIFO {
diff --git a/tests/cris/check_swap.c b/tests/cris/check_swap.c
index 743cfc5..824a685 100644
--- a/tests/cris/check_swap.c
+++ b/tests/cris/check_swap.c
@@ -41,7 +41,7 @@  do {                                                    \
         cris_tst_mov_cc(n, z);                          \
 	if (r != expected)                              \
 		err();                                  \
-} while(0);
+} while(0)
 
 void check_swap(void)
 {