From d4fb63e140aed000a5c6a9d463e616d8409b56f4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 2 Nov 2012 18:53:54 +0000 Subject: [PATCH] * configure: Rebuild. * configure.ac (build_warnings): Add -Wempty-body. * m68k-tdep.c (m68k_gdbarch_init): Remove empty 'if'. * remote.c (handle_notification): Use braces for empty 'else' body. * s390-tdep.c (s390_analyze_prologue): Use braces for empty 'else' body. * sh64-tdep.c (sh64_push_dummy_call): Use braces for empty 'else' body. * solib-som.c (som_relocate_section_addresses): Use braces for empty 'else' body. * ui-file.c (stdio_file_write): Use braces for empty 'if' body. (stdio_file_write_async_safe, stdio_file_fputs): Likewise. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/configure | 2 +- gdb/configure.ac | 2 +- gdb/m68k-tdep.c | 3 --- gdb/remote.c | 7 ++++--- gdb/s390-tdep.c | 15 ++++++++------- gdb/sh64-tdep.c | 15 ++++++++------- gdb/solib-som.c | 4 +++- gdb/ui-file.c | 12 +++++++++--- 9 files changed, 49 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 95e7777aa48..e2a2253867d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2012-11-02 Tom Tromey + + * configure: Rebuild. + * configure.ac (build_warnings): Add -Wempty-body. + * m68k-tdep.c (m68k_gdbarch_init): Remove empty 'if'. + * remote.c (handle_notification): Use braces for empty 'else' body. + * s390-tdep.c (s390_analyze_prologue): Use braces for empty + 'else' body. + * sh64-tdep.c (sh64_push_dummy_call): Use braces for empty + 'else' body. + * solib-som.c (som_relocate_section_addresses): Use braces + for empty 'else' body. + * ui-file.c (stdio_file_write): Use braces for empty 'if' body. + (stdio_file_write_async_safe, stdio_file_fputs): Likewise. + 2012-11-02 Pedro Alves PR gdb/14766 diff --git a/gdb/configure b/gdb/configure index 6941e9c0560..68ee7070798 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12470,7 +12470,7 @@ build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wformat-nonliteral -Wno-pointer-sign \ -Wno-unused -Wunused-value -Wunused-function \ -Wno-switch -Wno-char-subscripts -Wmissing-prototypes \ --Wdeclaration-after-statement" +-Wdeclaration-after-statement -Wempty-body" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. diff --git a/gdb/configure.ac b/gdb/configure.ac index fc181fd5e36..f0b7df37272 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1920,7 +1920,7 @@ build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wformat-nonliteral -Wno-pointer-sign \ -Wno-unused -Wunused-value -Wunused-function \ -Wno-switch -Wno-char-subscripts -Wmissing-prototypes \ --Wdeclaration-after-statement" +-Wdeclaration-after-statement -Wempty-body" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index b45a80f3f21..0bad9ace31c 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1100,9 +1100,6 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) feature = tdesc_find_feature (info.target_desc, "org.gnu.gdb.m68k.core"); - if (feature != NULL) - /* Do nothing. */ - ; if (feature == NULL) { diff --git a/gdb/remote.c b/gdb/remote.c index 14c5dfd59e2..8388eea6f17 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6781,9 +6781,10 @@ handle_notification (char *buf) } } else - /* We ignore notifications we don't recognize, for compatibility - with newer stubs. */ - ; + { + /* We ignore notifications we don't recognize, for compatibility + with newer stubs. */ + } } diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 6cd6fd48351..0af6f5131da 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1461,13 +1461,14 @@ s390_analyze_prologue (struct gdbarch *gdbarch, break; else - /* An instruction we don't know how to simulate. The only - safe thing to do would be to set every value we're tracking - to 'unknown'. Instead, we'll be optimistic: we assume that - we *can* interpret every instruction that the compiler uses - to manipulate any of the data we're interested in here -- - then we can just ignore anything else. */ - ; + { + /* An instruction we don't know how to simulate. The only + safe thing to do would be to set every value we're tracking + to 'unknown'. Instead, we'll be optimistic: we assume that + we *can* interpret every instruction that the compiler uses + to manipulate any of the data we're interested in here -- + then we can just ignore anything else. */ + } /* Record the address after the last instruction that changed the FP, SP, or backlink. Ignore instructions that changed diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 4e6f262462a..e11e7468f01 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -1175,10 +1175,10 @@ sh64_push_dummy_call (struct gdbarch *gdbarch, int_argreg ++; } else - ; - /* Store it as the integers, 8 bytes at the time, if - necessary spilling on the stack. */ - + { + /* Store it as the integers, 8 bytes at the time, if + necessary spilling on the stack. */ + } } else if (len == 8) { @@ -1202,9 +1202,10 @@ sh64_push_dummy_call (struct gdbarch *gdbarch, int_argreg ++; } else - ; - /* Store it as the integers, 8 bytes at the time, if - necessary spilling on the stack. */ + { + /* Store it as the integers, 8 bytes at the time, if + necessary spilling on the stack. */ + } } } } diff --git a/gdb/solib-som.c b/gdb/solib-som.c index 6100cbe6748..6fea10809d4 100644 --- a/gdb/solib-som.c +++ b/gdb/solib-som.c @@ -126,7 +126,9 @@ som_relocate_section_addresses (struct so_list *so, sec->endaddr += so->lm_info->data_start; } else - ; + { + /* Nothing. */ + } } diff --git a/gdb/ui-file.c b/gdb/ui-file.c index 8528793c74d..68089e60dab 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -561,7 +561,9 @@ stdio_file_write (struct ui_file *file, const char *buf, long length_buf) _("stdio_file_write: bad magic number")); /* Calling error crashes when we are called from the exception framework. */ if (fwrite (buf, length_buf, 1, stdio->file)) - ; + { + /* Nothing. */ + } } static void @@ -583,7 +585,9 @@ stdio_file_write_async_safe (struct ui_file *file, result of write (since it can be declared with attribute warn_unused_result). Alas casting to void doesn't work for this. */ if (write (stdio->fd, buf, length_buf)) - ; + { + /* Nothing. */ + } } static void @@ -596,7 +600,9 @@ stdio_file_fputs (const char *linebuffer, struct ui_file *file) _("stdio_file_fputs: bad magic number")); /* Calling error crashes when we are called from the exception framework. */ if (fputs (linebuffer, stdio->file)) - ; + { + /* Nothing. */ + } } static int -- 2.30.2