I've found a few whitespaces nits in the *.c and *.h files. I've fixed them. I intentionally didn't make any ChangeLog entries, since there are no code changes. Ok?
Signed-off-by: Marek Polacek <[email protected]> --- backends/arm_corenote.c | 2 +- backends/i386_corenote.c | 2 +- backends/ia64_retval.c | 2 +- backends/ppc_corenote.c | 10 +++++----- backends/sh_corenote.c | 2 +- backends/sparc_corenote.c | 10 +++++----- backends/x86_64_corenote.c | 2 +- lib/md5.c | 2 +- libdw/dwarf_aggregate_size.c | 2 +- libdw/dwarf_getscopes.c | 2 +- libdw/libdwP.h | 2 +- libdw/memory-access.h | 2 +- libdwfl/derelocate.c | 2 +- libelf/elf.h | 2 +- src/objdump.c | 6 +++--- src/readelf.c | 2 +- src/unstrip.c | 2 +- tests/get-lines.c | 2 +- tests/show-abbrev.c | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/backends/arm_corenote.c b/backends/arm_corenote.c index 6f2d3a3..c26d020 100644 --- a/backends/arm_corenote.c +++ b/backends/arm_corenote.c @@ -48,7 +48,7 @@ static const Ebl_Register_Location prstatus_regs[] = { \ .name = "orig_r0", .type = ELF_T_SWORD, .format = 'd', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg) + (4 * 17), \ - .group = "register" \ + .group = "register" \ } static const Ebl_Register_Location fpregset_regs[] = diff --git a/backends/i386_corenote.c b/backends/i386_corenote.c index 40b6a24..754a976 100644 --- a/backends/i386_corenote.c +++ b/backends/i386_corenote.c @@ -82,7 +82,7 @@ static const Ebl_Register_Location prstatus_regs[] = { \ .name = "orig_eax", .type = ELF_T_SWORD, .format = 'd', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg) + (4 * 11), \ - .group = "register" \ + .group = "register" \ } static const Ebl_Register_Location fpregset_regs[] = diff --git a/backends/ia64_retval.c b/backends/ia64_retval.c index 7645c3c..ce836a8 100644 --- a/backends/ia64_retval.c +++ b/backends/ia64_retval.c @@ -46,7 +46,7 @@ static const Dwarf_Op loc_intreg[] = #define nloc_intregs(n) (2 * (n)) /* f8, or aggregate up to f8-f15. */ -#define DEFINE_FPREG(size) \ +#define DEFINE_FPREG(size) \ static const Dwarf_Op loc_fpreg_##size[] = \ { \ { .atom = DW_OP_regx, .number = 128 + 8 }, \ diff --git a/backends/ppc_corenote.c b/backends/ppc_corenote.c index af0c46a..de74406 100644 --- a/backends/ppc_corenote.c +++ b/backends/ppc_corenote.c @@ -34,10 +34,10 @@ #include <sys/time.h> #ifndef BITS -# define BITS 32 +# define BITS 32 # define BACKEND ppc_ #else -# define BITS 64 +# define BITS 64 # define BACKEND ppc64_ #endif #include "libebl_CPU.h" @@ -120,12 +120,12 @@ static const Ebl_Register_Location spe_regs[] = { \ .name = "nip", .type = ELF_T_ADDR, .format = 'x', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg[32]), \ - .group = "register" \ - }, \ + .group = "register" \ + }, \ { \ .name = "orig_gpr3", .type = TYPE_LONG, .format = 'd', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg[34]), \ - .group = "register" \ + .group = "register" \ } #include "linux-core-note.c" diff --git a/backends/sh_corenote.c b/backends/sh_corenote.c index 80bcd6f..6f0c1e9 100644 --- a/backends/sh_corenote.c +++ b/backends/sh_corenote.c @@ -70,7 +70,7 @@ static const Ebl_Register_Location prstatus_regs[] = { \ .name = "tra", .type = ELF_T_ADDR, .format = 'x', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg[22]), \ - .group = "register" \ + .group = "register" \ } static const Ebl_Register_Location fpregset_regs[] = diff --git a/backends/sparc_corenote.c b/backends/sparc_corenote.c index 55aed8f..fcba1d6 100644 --- a/backends/sparc_corenote.c +++ b/backends/sparc_corenote.c @@ -34,10 +34,10 @@ #include <sys/time.h> #ifndef BITS -# define BITS 32 +# define BITS 32 # define BACKEND sparc_ #else -# define BITS 64 +# define BITS 64 # define BACKEND sparc64_ #endif #include "libebl_CPU.h" @@ -65,14 +65,14 @@ static const Ebl_Register_Location fpregset_regs[] = { #if BITS == 32 GR (0, 32, 32), /* %f0-%f31 */ - /* padding word */ + /* padding word */ GR (33, 1, 70), /* %fsr */ - /* qcnt, q_entrysize, en, q, padding */ + /* qcnt, q_entrysize, en, q, padding */ # define FPREGSET_SIZE (34 * 4 + 4 + 64 * 4 + 4) #else GR (0, 32, 32), /* %f0-%f31 */ GR (32, 1, 83), /* %fsr */ - /* 33, 1, %gsr */ + /* 33, 1, %gsr */ GR (34, 1, 84), /* %fprs */ # define FPREGSET_SIZE (35 * 8) #endif diff --git a/backends/x86_64_corenote.c b/backends/x86_64_corenote.c index 552ac88..35f533e 100644 --- a/backends/x86_64_corenote.c +++ b/backends/x86_64_corenote.c @@ -91,7 +91,7 @@ static const Ebl_Register_Location prstatus_regs[] = { \ .name = "orig_rax", .type = ELF_T_SXWORD, .format = 'd', \ .offset = offsetof (struct EBLHOOK(prstatus), pr_reg) + (8 * 15), \ - .group = "register" \ + .group = "register" \ } static const Ebl_Register_Location fpregset_regs[] = diff --git a/lib/md5.c b/lib/md5.c index 0770561..4494a53 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -369,7 +369,7 @@ md5_process_block (buffer, len, ctx) argument specifying the function to use. */ #undef OP #define OP(f, a, b, c, d, k, s, T) \ - do \ + do \ { \ a += f (b, c, d) + correct_words[k] + T; \ CYCLIC (a, s); \ diff --git a/libdw/dwarf_aggregate_size.c b/libdw/dwarf_aggregate_size.c index e742014..77d5609 100644 --- a/libdw/dwarf_aggregate_size.c +++ b/libdw/dwarf_aggregate_size.c @@ -192,7 +192,7 @@ array_size (Dwarf_Die *die, Dwarf_Word *size, { if (INTUSE(dwarf_formudata) (attr_mem, &stride) != 0) return -1; - if (stride % 8) /* XXX maybe compute in bits? */ + if (stride % 8) /* XXX maybe compute in bits? */ return -1; stride /= 8; } diff --git a/libdw/dwarf_getscopes.c b/libdw/dwarf_getscopes.c index 73431ba..d44612a 100644 --- a/libdw/dwarf_getscopes.c +++ b/libdw/dwarf_getscopes.c @@ -91,7 +91,7 @@ pc_match (unsigned int depth, struct Dwarf_Die_Chain *die, void *arg) result = 0; } if (result == 0) - die->prune = true; + die->prune = true; if (!die->prune && INTUSE (dwarf_tag) (&die->die) == DW_TAG_inlined_subroutine) diff --git a/libdw/libdwP.h b/libdw/libdwP.h index b84bf02..5a88861 100644 --- a/libdw/libdwP.h +++ b/libdw/libdwP.h @@ -317,7 +317,7 @@ struct Dwarf_CU LEN VER OFFSET ADDR 4-bytes + 2-bytes + 4-bytes + 1-byte for 32-bit dwarf 12-bytes + 2-bytes + 8-bytes + 1-byte for 64-bit dwarf - or in .debug_types, SIGNATURE TYPE-OFFSET + or in .debug_types, SIGNATURE TYPE-OFFSET 4-bytes + 2-bytes + 4-bytes + 1-byte + 8-bytes + 4-bytes for 32-bit 12-bytes + 2-bytes + 8-bytes + 1-byte + 8-bytes + 8-bytes for 64-bit diff --git a/libdw/memory-access.h b/libdw/memory-access.h index b7799e9..5d7dc0d 100644 --- a/libdw/memory-access.h +++ b/libdw/memory-access.h @@ -91,7 +91,7 @@ if (likely ((__b & 0x80) == 0)) \ { \ var = (_v << (64 - (nth * 7) - 7)) >> (64 - (nth * 7) - 7); \ - break; \ + break; \ } \ else do {} while (0) diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c index ba6d9db..d488054 100644 --- a/libdwfl/derelocate.c +++ b/libdwfl/derelocate.c @@ -202,7 +202,7 @@ cache_sections (Dwfl_Module *mod) if (shdr == NULL) goto elf_error; - if (shdr->sh_size != 0 + if (shdr->sh_size != 0 && (shdr->sh_type == SHT_REL || shdr->sh_type == SHT_RELA)) { Elf_Scn *tscn = elf_getscn (mod->main.elf, shdr->sh_info); diff --git a/libelf/elf.h b/libelf/elf.h index a9558a3..2a413be 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -2695,7 +2695,7 @@ typedef Elf32_Addr Elf32_Conflict; #define R_X86_64_GOTPCREL64 28 /* 64-bit PC relative offset to GOT entry */ #define R_X86_64_GOTPC64 29 /* 64-bit PC relative offset to GOT */ -#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ +#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ #define R_X86_64_PLTOFF64 31 /* 64-bit GOT relative offset to PLT entry */ #define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ diff --git a/src/objdump.c b/src/objdump.c index 1234c79..66ab445 100644 --- a/src/objdump.c +++ b/src/objdump.c @@ -499,7 +499,7 @@ show_relocs (Ebl *ebl, const char *fname, uint32_t shstrndx) if (shdr->sh_type == SHT_REL || shdr->sh_type == SHT_RELA) { - if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) + if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) continue; GElf_Shdr destshdr_mem; @@ -570,7 +570,7 @@ show_full_content (Ebl *ebl, const char *fname, uint32_t shstrndx) if (shdr->sh_type == SHT_PROGBITS && shdr->sh_size > 0) { - if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) + if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) continue; printf (gettext ("Contents of section %s:\n"), @@ -687,7 +687,7 @@ show_disasm (Ebl *ebl, const char *fname, uint32_t shstrndx) if (shdr->sh_type == SHT_PROGBITS && shdr->sh_size > 0 && (shdr->sh_flags & SHF_EXECINSTR) != 0) { - if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) + if (! section_match (ebl->elf, elf_ndxscn (scn), shdr, shstrndx)) continue; Elf_Data *data = elf_getdata (scn, NULL); diff --git a/src/readelf.c b/src/readelf.c index f2c4800..6b8b0ee 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -187,7 +187,7 @@ static enum section_e section_pubnames = 64, /* .debug_pubnames */ section_str = 128, /* .debug_str */ section_macinfo = 256, /* .debug_macinfo */ - section_ranges = 512, /* .debug_ranges */ + section_ranges = 512, /* .debug_ranges */ section_exception = 1024, /* .eh_frame & al. */ section_all = (section_abbrev | section_aranges | section_frame | section_info | section_line | section_loc diff --git a/src/unstrip.c b/src/unstrip.c index 3283d73..59b58ce 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -242,7 +242,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ #define ELF_CHECK(call, msg) \ do \ { \ - if (!(call)) \ + if (!(call)) \ error (EXIT_FAILURE, 0, msg, elf_errmsg (-1)); \ } while (0) diff --git a/tests/get-lines.c b/tests/get-lines.c index 45d2c8d..8865461 100644 --- a/tests/get-lines.c +++ b/tests/get-lines.c @@ -67,7 +67,7 @@ main (int argc, char *argv[]) /* Get the DIE for the CU. */ Dwarf_Die die; - if (dwarf_offdie (dbg, old_cuoff + hsize, &die) == NULL) + if (dwarf_offdie (dbg, old_cuoff + hsize, &die) == NULL) { /* Something went wrong. */ printf ("%s: cannot get CU die\n", argv[cnt]); diff --git a/tests/show-abbrev.c b/tests/show-abbrev.c index 75fddf5..cac525f 100644 --- a/tests/show-abbrev.c +++ b/tests/show-abbrev.c @@ -55,7 +55,7 @@ main (int argc, char *argv[]) { /* Get the DIE for the CU. */ Dwarf_Die die; - if (dwarf_offdie (dbg, old_cuoff + hsize, &die) == NULL) + if (dwarf_offdie (dbg, old_cuoff + hsize, &die) == NULL) /* Something went wrong. */ break; -- 1.7.3.4 _______________________________________________ elfutils-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/elfutils-devel
