diff options
| author | Rich Felker <dalias@aerifal.cx> | 2016-07-03 14:40:11 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-07-03 15:02:25 -0400 |
| commit | befa5866ee30d09c0c96e88af2eabff5911342ea (patch) | |
| tree | a72045d740e0a4b204ef6d742f7f3a3ca12e6c0e /arch | |
| parent | 093288dcb37a30c634b0a00eb7e2a0dbe72ebf95 (diff) | |
| download | musl-befa5866ee30d09c0c96e88af2eabff5911342ea.tar.gz musl-befa5866ee30d09c0c96e88af2eabff5911342ea.tar.xz musl-befa5866ee30d09c0c96e88af2eabff5911342ea.zip | |
make brace placement in public header struct definitions consistent
placing the opening brace on the same line as the struct keyword/tag
is the style I prefer and seems to be the prevailing practice in more
recent additions.
these changes were generated by the command:
find include/ arch/*/bits -name '*.h' \
-exec sed -i '/^struct [^;{]*$/{N;s/\n/ /;}' {} +
and subsequently checked by hand to ensure that the regex did not pick
up any false positives.
Diffstat (limited to 'arch')
44 files changed, 54 insertions, 108 deletions
diff --git a/arch/aarch64/bits/ipc.h b/arch/aarch64/bits/ipc.h index 9a47bc7a..6f3328a8 100644 --- a/arch/aarch64/bits/ipc.h +++ b/arch/aarch64/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/aarch64/bits/msg.h b/arch/aarch64/bits/msg.h index 0135a08d..641e1703 100644 --- a/arch/aarch64/bits/msg.h +++ b/arch/aarch64/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; time_t msg_rtime; diff --git a/arch/aarch64/bits/shm.h b/arch/aarch64/bits/shm.h index 4c3c9fb7..8d193781 100644 --- a/arch/aarch64/bits/shm.h +++ b/arch/aarch64/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/aarch64/bits/socket.h b/arch/aarch64/bits/socket.h index b3fe643a..c11677e9 100644 --- a/arch/aarch64/bits/socket.h +++ b/arch/aarch64/bits/socket.h @@ -1,7 +1,6 @@ #include <endian.h> -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -21,8 +20,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { #if __BYTE_ORDER == __BIG_ENDIAN int __pad1; socklen_t cmsg_len; diff --git a/arch/arm/bits/stat.h b/arch/arm/bits/stat.h index bb9314a5..22b19bbf 100644 --- a/arch/arm/bits/stat.h +++ b/arch/arm/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; int __st_dev_padding; long __st_ino_truncated; diff --git a/arch/generic/bits/ipc.h b/arch/generic/bits/ipc.h index b748d3b7..779c42fd 100644 --- a/arch/generic/bits/ipc.h +++ b/arch/generic/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/generic/bits/msg.h b/arch/generic/bits/msg.h index 3db8576b..bc8436c4 100644 --- a/arch/generic/bits/msg.h +++ b/arch/generic/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; int __unused1; diff --git a/arch/generic/bits/shm.h b/arch/generic/bits/shm.h index 547581f1..45d1d157 100644 --- a/arch/generic/bits/shm.h +++ b/arch/generic/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/generic/bits/socket.h b/arch/generic/bits/socket.h index 36febbc2..1f73b995 100644 --- a/arch/generic/bits/socket.h +++ b/arch/generic/bits/socket.h @@ -1,5 +1,4 @@ -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -9,8 +8,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { socklen_t cmsg_len; int cmsg_level; int cmsg_type; diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h index 941de7bd..434c02c8 100644 --- a/arch/generic/bits/termios.h +++ b/arch/generic/bits/termios.h @@ -1,5 +1,4 @@ -struct termios -{ +struct termios { tcflag_t c_iflag; tcflag_t c_oflag; tcflag_t c_cflag; diff --git a/arch/i386/bits/stat.h b/arch/i386/bits/stat.h index bb9314a5..22b19bbf 100644 --- a/arch/i386/bits/stat.h +++ b/arch/i386/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; int __st_dev_padding; long __st_ino_truncated; diff --git a/arch/i386/bits/user.h b/arch/i386/bits/user.h index fa623621..2c556dd2 100644 --- a/arch/i386/bits/user.h +++ b/arch/i386/bits/user.h @@ -13,8 +13,7 @@ typedef struct user_fpxregs_struct long st_space[32], xmm_space[32], padding[56]; } elf_fpxregset_t; -struct user_regs_struct -{ +struct user_regs_struct { long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs; long orig_eax, eip, xcs, eflags, esp, xss; }; @@ -22,8 +21,7 @@ struct user_regs_struct #define ELF_NGREG 17 typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG]; -struct user -{ +struct user { struct user_regs_struct regs; int u_fpvalid; struct user_fpregs_struct i387; diff --git a/arch/microblaze/bits/stat.h b/arch/microblaze/bits/stat.h index a8c0283d..ce6a6bd0 100644 --- a/arch/microblaze/bits/stat.h +++ b/arch/microblaze/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; ino_t st_ino; mode_t st_mode; diff --git a/arch/mips/bits/msg.h b/arch/mips/bits/msg.h index bfe2b3a7..f28aece8 100644 --- a/arch/mips/bits/msg.h +++ b/arch/mips/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; #if _MIPSEL || __MIPSEL || __MIPSEL__ time_t msg_stime; diff --git a/arch/mips/bits/shm.h b/arch/mips/bits/shm.h index f4b87126..6652d659 100644 --- a/arch/mips/bits/shm.h +++ b/arch/mips/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h index 889f77e8..db6f22d5 100644 --- a/arch/mips/bits/signal.h +++ b/arch/mips/bits/signal.h @@ -17,8 +17,7 @@ typedef struct { } fp_fregs[32]; } fp_r; } fpregset_t; -struct sigcontext -{ +struct sigcontext { unsigned sc_regmask, sc_status; unsigned long long sc_pc, sc_regs[32], sc_fpregs[32]; unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp; diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h index cc72dcf9..191ebdb5 100644 --- a/arch/mips/bits/socket.h +++ b/arch/mips/bits/socket.h @@ -1,5 +1,4 @@ -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -9,8 +8,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { socklen_t cmsg_len; int cmsg_level; int cmsg_type; diff --git a/arch/mips/bits/stat.h b/arch/mips/bits/stat.h index c8f9b469..3291a636 100644 --- a/arch/mips/bits/stat.h +++ b/arch/mips/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; long __st_padding1[2]; ino_t st_ino; diff --git a/arch/mipsn32/bits/msg.h b/arch/mipsn32/bits/msg.h index bfe2b3a7..f28aece8 100644 --- a/arch/mipsn32/bits/msg.h +++ b/arch/mipsn32/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; #if _MIPSEL || __MIPSEL || __MIPSEL__ time_t msg_stime; diff --git a/arch/powerpc/bits/ipc.h b/arch/powerpc/bits/ipc.h index e1bfe2f5..3f2ede07 100644 --- a/arch/powerpc/bits/ipc.h +++ b/arch/powerpc/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/powerpc/bits/msg.h b/arch/powerpc/bits/msg.h index a6b9ad5b..171c11a3 100644 --- a/arch/powerpc/bits/msg.h +++ b/arch/powerpc/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; int __unused1; time_t msg_stime; diff --git a/arch/powerpc/bits/shm.h b/arch/powerpc/bits/shm.h index c698ef34..40e5e8be 100644 --- a/arch/powerpc/bits/shm.h +++ b/arch/powerpc/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; int __unused1; time_t shm_atime; diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h index 17a7354f..06efb11c 100644 --- a/arch/powerpc/bits/signal.h +++ b/arch/powerpc/bits/signal.h @@ -23,8 +23,7 @@ typedef struct { unsigned vscr; } vrregset_t; -struct sigcontext -{ +struct sigcontext { unsigned long _unused[4]; int signal; unsigned long handler; diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h index 18087919..2fee8777 100644 --- a/arch/powerpc/bits/socket.h +++ b/arch/powerpc/bits/socket.h @@ -1,5 +1,4 @@ -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -9,8 +8,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { socklen_t cmsg_len; int cmsg_level; int cmsg_type; diff --git a/arch/powerpc/bits/stat.h b/arch/powerpc/bits/stat.h index bd524a1a..dcb896fd 100644 --- a/arch/powerpc/bits/stat.h +++ b/arch/powerpc/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; ino_t st_ino; mode_t st_mode; diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h index 7f67baf4..0b09630c 100644 --- a/arch/powerpc/bits/termios.h +++ b/arch/powerpc/bits/termios.h @@ -1,7 +1,6 @@ #undef NCCS #define NCCS 19 -struct termios -{ +struct termios { tcflag_t c_iflag; tcflag_t c_oflag; tcflag_t c_cflag; diff --git a/arch/powerpc64/bits/ipc.h b/arch/powerpc64/bits/ipc.h index e1bfe2f5..3f2ede07 100644 --- a/arch/powerpc64/bits/ipc.h +++ b/arch/powerpc64/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/powerpc64/bits/msg.h b/arch/powerpc64/bits/msg.h index badcf168..2e23ca27 100644 --- a/arch/powerpc64/bits/msg.h +++ b/arch/powerpc64/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; time_t msg_rtime; diff --git a/arch/powerpc64/bits/shm.h b/arch/powerpc64/bits/shm.h index 91268516..8108c3a8 100644 --- a/arch/powerpc64/bits/shm.h +++ b/arch/powerpc64/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; time_t shm_atime; time_t shm_dtime; diff --git a/arch/powerpc64/bits/socket.h b/arch/powerpc64/bits/socket.h index ec3590c6..2f748ae8 100644 --- a/arch/powerpc64/bits/socket.h +++ b/arch/powerpc64/bits/socket.h @@ -1,7 +1,6 @@ #include <endian.h> -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -21,8 +20,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { #if __BYTE_ORDER == __BIG_ENDIAN int __pad1; socklen_t cmsg_len; diff --git a/arch/powerpc64/bits/stat.h b/arch/powerpc64/bits/stat.h index 8172cff7..320b49bb 100644 --- a/arch/powerpc64/bits/stat.h +++ b/arch/powerpc64/bits/stat.h @@ -1,5 +1,4 @@ -struct stat -{ +struct stat { dev_t st_dev; ino_t st_ino; nlink_t st_nlink; diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h index 7f67baf4..0b09630c 100644 --- a/arch/powerpc64/bits/termios.h +++ b/arch/powerpc64/bits/termios.h @@ -1,7 +1,6 @@ #undef NCCS #define NCCS 19 -struct termios -{ +struct termios { tcflag_t c_iflag; tcflag_t c_oflag; tcflag_t c_cflag; diff --git a/arch/sh/bits/shm.h b/arch/sh/bits/shm.h index a210fd4a..6cdac131 100644 --- a/arch/sh/bits/shm.h +++ b/arch/sh/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 16384 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/sh/bits/stat.h b/arch/sh/bits/stat.h index bb9314a5..22b19bbf 100644 --- a/arch/sh/bits/stat.h +++ b/arch/sh/bits/stat.h @@ -1,8 +1,7 @@ /* copied from kernel definition, but with padding replaced * by the corresponding correctly-sized userspace types. */ -struct stat -{ +struct stat { dev_t st_dev; int __st_dev_padding; long __st_ino_truncated; diff --git a/arch/x32/bits/ipc.h b/arch/x32/bits/ipc.h index 6e604cef..55d2e41a 100644 --- a/arch/x32/bits/ipc.h +++ b/arch/x32/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/x32/bits/msg.h b/arch/x32/bits/msg.h index c3b4eae0..63ae9877 100644 --- a/arch/x32/bits/msg.h +++ b/arch/x32/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; time_t msg_rtime; diff --git a/arch/x32/bits/shm.h b/arch/x32/bits/shm.h index 8fa9e73d..fa88c1e9 100644 --- a/arch/x32/bits/shm.h +++ b/arch/x32/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/x32/bits/socket.h b/arch/x32/bits/socket.h index a90c4cae..a4c89f3d 100644 --- a/arch/x32/bits/socket.h +++ b/arch/x32/bits/socket.h @@ -1,5 +1,4 @@ -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -9,8 +8,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { socklen_t cmsg_len; int __pad1; int cmsg_level; diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h index 1bd2d709..a6edcd1a 100644 --- a/arch/x32/bits/user.h +++ b/arch/x32/bits/user.h @@ -9,8 +9,7 @@ typedef struct user_fpregs_struct uint32_t st_space[32], xmm_space[64], padding[24]; } elf_fpregset_t; -struct user_regs_struct -{ +struct user_regs_struct { unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8; unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip; unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs; @@ -18,8 +17,7 @@ struct user_regs_struct #define ELF_NGREG 27 typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG]; -struct user -{ +struct user { struct user_regs_struct regs; int u_fpvalid; struct user_fpregs_struct i387; diff --git a/arch/x86_64/bits/ipc.h b/arch/x86_64/bits/ipc.h index ac5d0979..3d894e30 100644 --- a/arch/x86_64/bits/ipc.h +++ b/arch/x86_64/bits/ipc.h @@ -1,5 +1,4 @@ -struct ipc_perm -{ +struct ipc_perm { key_t __ipc_perm_key; uid_t uid; gid_t gid; diff --git a/arch/x86_64/bits/msg.h b/arch/x86_64/bits/msg.h index badcf168..2e23ca27 100644 --- a/arch/x86_64/bits/msg.h +++ b/arch/x86_64/bits/msg.h @@ -1,5 +1,4 @@ -struct msqid_ds -{ +struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; time_t msg_rtime; diff --git a/arch/x86_64/bits/shm.h b/arch/x86_64/bits/shm.h index f4b87126..6652d659 100644 --- a/arch/x86_64/bits/shm.h +++ b/arch/x86_64/bits/shm.h @@ -1,7 +1,6 @@ #define SHMLBA 4096 -struct shmid_ds -{ +struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; diff --git a/arch/x86_64/bits/socket.h b/arch/x86_64/bits/socket.h index a90c4cae..a4c89f3d 100644 --- a/arch/x86_64/bits/socket.h +++ b/arch/x86_64/bits/socket.h @@ -1,5 +1,4 @@ -struct msghdr -{ +struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; @@ -9,8 +8,7 @@ struct msghdr int msg_flags; }; -struct cmsghdr -{ +struct cmsghdr { socklen_t cmsg_len; int __pad1; int cmsg_level; diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h index 1bd2d709..a6edcd1a 100644 --- a/arch/x86_64/bits/user.h +++ b/arch/x86_64/bits/user.h @@ -9,8 +9,7 @@ typedef struct user_fpregs_struct uint32_t st_space[32], xmm_space[64], padding[24]; } elf_fpregset_t; -struct user_regs_struct -{ +struct user_regs_struct { unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8; unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip; unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs; @@ -18,8 +17,7 @@ struct user_regs_struct #define ELF_NGREG 27 typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG]; -struct user -{ +struct user { struct user_regs_struct regs; int u_fpvalid; struct user_fpregs_struct i387; |