From ee3f0c551669ca1c61abac0888f93a27b0b17856 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 3 Jul 2016 16:19:28 -0400 Subject: [PATCH] make brace placement in public header typedef'd structs consistent commit befa5866ee30d09c0c96e88af2eabff5911342ea performed this change for struct definitions that did not also involve typedef, but omitted the latter. --- arch/aarch64/bits/signal.h | 3 +-- arch/arm/bits/signal.h | 3 +-- arch/i386/bits/user.h | 6 ++---- arch/microblaze/bits/signal.h | 3 +-- arch/mips/bits/signal.h | 3 +-- arch/powerpc64/bits/signal.h | 3 +-- arch/x32/bits/user.h | 3 +-- arch/x86_64/bits/user.h | 3 +-- include/elf.h | 18 ++++++------------ include/sys/select.h | 3 +-- include/wordexp.h | 3 +-- 11 files changed, 17 insertions(+), 34 deletions(-) diff --git a/arch/aarch64/bits/signal.h b/arch/aarch64/bits/signal.h index ef07cc9f..00fb5f33 100644 --- a/arch/aarch64/bits/signal.h +++ b/arch/aarch64/bits/signal.h @@ -15,8 +15,7 @@ typedef struct { unsigned int fpsr; unsigned int fpcr; } fpregset_t; -typedef struct sigcontext -{ +typedef struct sigcontext { unsigned long fault_address; unsigned long regs[31]; unsigned long sp, pc, pstate; diff --git a/arch/arm/bits/signal.h b/arch/arm/bits/signal.h index 9d19eeb2..3c789856 100644 --- a/arch/arm/bits/signal.h +++ b/arch/arm/bits/signal.h @@ -8,8 +8,7 @@ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) typedef int greg_t, gregset_t[18]; -typedef struct sigcontext -{ +typedef struct sigcontext { unsigned long trap_no, error_code, oldmask; unsigned long arm_r0, arm_r1, arm_r2, arm_r3; unsigned long arm_r4, arm_r5, arm_r6, arm_r7; diff --git a/arch/i386/bits/user.h b/arch/i386/bits/user.h index 2c556dd2..0e343930 100644 --- a/arch/i386/bits/user.h +++ b/arch/i386/bits/user.h @@ -1,13 +1,11 @@ #undef __WORDSIZE #define __WORDSIZE 32 -typedef struct user_fpregs_struct -{ +typedef struct user_fpregs_struct { long cwd, swd, twd, fip, fcs, foo, fos, st_space[20]; } elf_fpregset_t; -typedef struct user_fpxregs_struct -{ +typedef struct user_fpxregs_struct { unsigned short cwd, swd, twd, fop; long fip, fcs, foo, fos, mxcsr, reserved; long st_space[32], xmm_space[32], padding[56]; diff --git a/arch/microblaze/bits/signal.h b/arch/microblaze/bits/signal.h index 4aa231a2..490f83bf 100644 --- a/arch/microblaze/bits/signal.h +++ b/arch/microblaze/bits/signal.h @@ -8,8 +8,7 @@ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) typedef unsigned long greg_t, gregset_t[38]; -typedef struct sigcontext -{ +typedef struct sigcontext { struct { unsigned long r0, r1, r2, r3, r4, r5, r6, r7; unsigned long r8, r9, r10, r11, r12, r13, r14, r15; diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h index db6f22d5..1a84de59 100644 --- a/arch/mips/bits/signal.h +++ b/arch/mips/bits/signal.h @@ -24,8 +24,7 @@ struct sigcontext { unsigned long long sc_mdhi, sc_mdlo; unsigned long sc_hi1, sc_lo1, sc_hi2, sc_lo2, sc_hi3, sc_lo3; }; -typedef struct -{ +typedef struct { unsigned regmask, status; unsigned long long pc, gregs[32], fpregs[32]; unsigned ownedfp, fpc_csr, fpc_eir, used_math, dsp; diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h index 45aeea0d..34693a68 100644 --- a/arch/powerpc64/bits/signal.h +++ b/arch/powerpc64/bits/signal.h @@ -23,8 +23,7 @@ typedef struct { unsigned _pad2[3]; } vrregset_t; -typedef struct sigcontext -{ +typedef struct sigcontext { unsigned long _unused[4]; int signal; int _pad0; diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h index a6edcd1a..471bb19d 100644 --- a/arch/x32/bits/user.h +++ b/arch/x32/bits/user.h @@ -1,8 +1,7 @@ #undef __WORDSIZE #define __WORDSIZE 64 -typedef struct user_fpregs_struct -{ +typedef struct user_fpregs_struct { uint16_t cwd, swd, ftw, fop; uint64_t rip, rdp; uint32_t mxcsr, mxcr_mask; diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h index a6edcd1a..471bb19d 100644 --- a/arch/x86_64/bits/user.h +++ b/arch/x86_64/bits/user.h @@ -1,8 +1,7 @@ #undef __WORDSIZE #define __WORDSIZE 64 -typedef struct user_fpregs_struct -{ +typedef struct user_fpregs_struct { uint16_t cwd, swd, ftw, fop; uint64_t rip, rdp; uint32_t mxcsr, mxcr_mask; diff --git a/include/elf.h b/include/elf.h index 8ecf965a..0721d63f 100644 --- a/include/elf.h +++ b/include/elf.h @@ -324,15 +324,13 @@ typedef struct { #define SHF_ORDERED (1 << 30) #define SHF_EXCLUDE (1U << 31) -typedef struct -{ +typedef struct { Elf32_Word ch_type; Elf32_Word ch_size; Elf32_Word ch_addralign; } Elf32_Chdr; -typedef struct -{ +typedef struct { Elf64_Word ch_type; Elf64_Word ch_reserved; Elf64_Xword ch_size; @@ -434,8 +432,7 @@ typedef struct { -typedef struct -{ +typedef struct { Elf32_Addr r_offset; Elf32_Word r_info; } Elf32_Rel; @@ -1513,8 +1510,7 @@ typedef struct { -typedef struct -{ +typedef struct { Elf32_Word l_name; Elf32_Word l_time_stamp; Elf32_Word l_checksum; @@ -1522,8 +1518,7 @@ typedef struct Elf32_Word l_flags; } Elf32_Lib; -typedef struct -{ +typedef struct { Elf64_Word l_name; Elf64_Word l_time_stamp; Elf64_Word l_checksum; @@ -1546,8 +1541,7 @@ typedef struct typedef Elf32_Addr Elf32_Conflict; -typedef struct -{ +typedef struct { Elf32_Half version; unsigned char isa_level; unsigned char isa_rev; diff --git a/include/sys/select.h b/include/sys/select.h index e25257d2..d34cbf10 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -19,8 +19,7 @@ extern "C" { typedef unsigned long fd_mask; -typedef struct -{ +typedef struct { unsigned long fds_bits[FD_SETSIZE / 8 / sizeof(long)]; } fd_set; diff --git a/include/wordexp.h b/include/wordexp.h index d12081e8..5460002d 100644 --- a/include/wordexp.h +++ b/include/wordexp.h @@ -18,8 +18,7 @@ extern "C" { #define WRDE_SHOWERR 16 #define WRDE_UNDEF 32 -typedef struct -{ +typedef struct { size_t we_wordc; char **we_wordv; size_t we_offs; -- 2.25.1