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.

diff --git a/arch/aarch64/bits/ipc.h b/arch/aarch64/bits/ipc.h
index 9a47bc7..6f3328a 100644 (file)
--- 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 0135a08..641e170 100644 (file)
--- 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 4c3c9fb..8d19378 100644 (file)
--- 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 b3fe643..c11677e 100644 (file)
--- 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 bb9314a..22b19bb 100644 (file)
--- 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 b748d3b..779c42f 100644 (file)
--- 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 3db8576..bc8436c 100644 (file)
--- 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 547581f..45d1d15 100644 (file)
--- 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 36febbc..1f73b99 100644 (file)
--- 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 941de7b..434c02c 100644 (file)
--- 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 bb9314a..22b19bb 100644 (file)
--- 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 fa62362..2c556dd 100644 (file)
--- 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 a8c0283..ce6a6bd 100644 (file)
--- 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 bfe2b3a..f28aece 100644 (file)
--- 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 f4b8712..6652d65 100644 (file)
--- 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 889f77e..db6f22d 100644 (file)
--- 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 cc72dcf..191ebdb 100644 (file)
--- 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 c8f9b46..3291a63 100644 (file)
--- 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 bfe2b3a..f28aece 100644 (file)
--- 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 e1bfe2f..3f2ede0 100644 (file)
--- 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 a6b9ad5..171c11a 100644 (file)
--- 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 c698ef3..40e5e8b 100644 (file)
--- 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 17a7354..06efb11 100644 (file)
--- 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 1808791..2fee877 100644 (file)
--- 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 bd524a1..dcb896f 100644 (file)
--- 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 7f67baf..0b09630 100644 (file)
--- 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 e1bfe2f..3f2ede0 100644 (file)
--- 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 badcf16..2e23ca2 100644 (file)
--- 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 9126851..8108c3a 100644 (file)
--- 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 ec3590c..2f748ae 100644 (file)
--- 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 8172cff..320b49b 100644 (file)
--- 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 7f67baf..0b09630 100644 (file)
--- 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 a210fd4..6cdac13 100644 (file)
--- 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 bb9314a..22b19bb 100644 (file)
--- 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 6e604ce..55d2e41 100644 (file)
--- 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 c3b4eae..63ae987 100644 (file)
--- 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 8fa9e73..fa88c1e 100644 (file)
--- 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 a90c4ca..a4c89f3 100644 (file)
--- 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 1bd2d70..a6edcd1 100644 (file)
--- 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 ac5d097..3d894e3 100644 (file)
--- 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 badcf16..2e23ca2 100644 (file)
--- 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 f4b8712..6652d65 100644 (file)
--- 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 a90c4ca..a4c89f3 100644 (file)
--- 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 1bd2d70..a6edcd1 100644 (file)
--- 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;

diff --git a/include/dirent.h b/include/dirent.h
index 5aa8510..006a360 100644 (file)
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -17,8 +17,7 @@ extern "C" {
 
 typedef struct __dirstream DIR;
 
-struct dirent
-{
+struct dirent {
        ino_t d_ino;
        off_t d_off;
        unsigned short d_reclen;

diff --git a/include/fcntl.h b/include/fcntl.h
index ebd5c30..e683e4d 100644 (file)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -21,8 +21,7 @@ extern "C" {
 
 #include <bits/fcntl.h>
 
-struct flock
-{
+struct flock {
        short l_type;
        short l_whence;
        off_t l_start;

diff --git a/include/ftw.h b/include/ftw.h
index c8eadbc..b15c062 100644 (file)
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -21,8 +21,7 @@ extern "C" {
 #define FTW_CHDIR 4
 #define FTW_DEPTH 8
 
-struct FTW
-{
+struct FTW {
        int base;
        int level;
 };

diff --git a/include/getopt.h b/include/getopt.h
index c1d0df9..35cbd35 100644 (file)
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -9,8 +9,7 @@ int getopt(int, char * const [], const char *);
 extern char *optarg;
 extern int optind, opterr, optopt, optreset;
 
-struct option
-{
+struct option {
        const char *name;
        int has_arg;
        int *flag;

diff --git a/include/grp.h b/include/grp.h
index b331d32..358181b 100644 (file)
--- a/include/grp.h
+++ b/include/grp.h
@@ -16,8 +16,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct group
-{
+struct group {
        char *gr_name;
        char *gr_passwd;
        gid_t gr_gid;

diff --git a/include/mntent.h b/include/mntent.h
index d03c414..3492a1d 100644 (file)
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -20,8 +20,7 @@ extern "C" {
 #define MNTOPT_NOSUID  "nosuid"
 #define MNTOPT_NOAUTO  "noauto"
 
-struct mntent
-{
+struct mntent {
        char *mnt_fsname;
        char *mnt_dir;
        char *mnt_type;

diff --git a/include/net/if.h b/include/net/if.h
index 3f4fc09..1a4059d 100644 (file)
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -9,8 +9,7 @@ extern "C" {
 
 #define IF_NAMESIZE 16
 
-struct if_nameindex
-{
+struct if_nameindex {
        unsigned int if_index;
        char *if_name;
 };

diff --git a/include/netdb.h b/include/netdb.h
index 4794068..967ca21 100644 (file)
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -13,8 +13,7 @@ extern "C" {
 #include <bits/alltypes.h>
 #endif
 
-struct addrinfo
-{
+struct addrinfo {
        int ai_flags;
        int ai_family;
        int ai_socktype;
@@ -62,16 +61,14 @@ const char *gai_strerror(int);
 
 /* Legacy functions follow (marked OBsolete in SUS) */
 
-struct netent
-{
+struct netent {
        char *n_name;
        char **n_aliases;
        int n_addrtype;
        uint32_t n_net;
 };
 
-struct hostent
-{
+struct hostent {
        char *h_name;
        char **h_aliases;
        int h_addrtype;
@@ -80,16 +77,14 @@ struct hostent
 };
 #define h_addr h_addr_list[0]
 
-struct servent
-{
+struct servent {
        char *s_name;
        char **s_aliases;
        int s_port;
        char *s_proto;
 };
 
-struct protoent
-{
+struct protoent {
        char *p_name;
        char **p_aliases;
        int p_proto;

diff --git a/include/netinet/in.h b/include/netinet/in.h
index 04cc81c..f6bb77b 100644 (file)
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -13,16 +13,14 @@ typedef uint16_t in_port_t;
 typedef uint32_t in_addr_t;
 struct in_addr { in_addr_t s_addr; };
 
-struct sockaddr_in
-{
+struct sockaddr_in {
        sa_family_t sin_family;
        in_port_t sin_port;
        struct in_addr sin_addr;
        uint8_t sin_zero[8];
 };
 
-struct in6_addr
-{
+struct in6_addr {
        union {
                uint8_t __s6_addr[16];
                uint16_t __s6_addr16[8];
@@ -33,8 +31,7 @@ struct in6_addr
 #define s6_addr16 __in6_union.__s6_addr16
 #define s6_addr32 __in6_union.__s6_addr32
 
-struct sockaddr_in6
-{
+struct sockaddr_in6 {
        sa_family_t     sin6_family;
        in_port_t       sin6_port;
        uint32_t        sin6_flowinfo;
@@ -42,8 +39,7 @@ struct sockaddr_in6
        uint32_t        sin6_scope_id;
 };
 
-struct ipv6_mreq
-{
+struct ipv6_mreq {
        struct in6_addr ipv6mr_multiaddr;
        unsigned        ipv6mr_interface;
 };
@@ -228,8 +224,7 @@ uint16_t ntohs(uint16_t);
 #define IP_DEFAULT_MULTICAST_LOOP       1
 #define IP_MAX_MEMBERSHIPS              20
 
-struct ip_opts
-{
+struct ip_opts {
        struct in_addr ip_dst;
        char ip_opts[40];
 };
@@ -247,14 +242,12 @@ struct ip_opts
 #define MCAST_EXCLUDE 0
 #define MCAST_INCLUDE 1
 
-struct ip_mreq
-{
+struct ip_mreq {
        struct in_addr imr_multiaddr;
        struct in_addr imr_interface;
 };
 
-struct ip_mreqn
-{
+struct ip_mreqn {
        struct in_addr imr_multiaddr;
        struct in_addr imr_address;
        int imr_ifindex;
@@ -299,21 +292,18 @@ struct group_filter {
        (sizeof(struct group_filter) - sizeof(struct sockaddr_storage) \
        + (numsrc) * sizeof(struct sockaddr_storage))
 
-struct in_pktinfo
-{
+struct in_pktinfo {
        int ipi_ifindex;
        struct in_addr ipi_spec_dst;
        struct in_addr ipi_addr;
 };
 
-struct in6_pktinfo
-{
+struct in6_pktinfo {
        struct in6_addr ipi6_addr;
        unsigned ipi6_ifindex;
 };
 
-struct ip6_mtuinfo
-{
+struct ip6_mtuinfo {
        struct sockaddr_in6 ip6m_addr;
        uint32_t ip6m_mtu;
 };

diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h
index d6f41ca..9ea64c4 100644 (file)
--- a/include/netinet/tcp.h
+++ b/include/netinet/tcp.h
@@ -145,8 +145,7 @@ struct tcphdr {
 #define TCP_CA_Recovery                3
 #define TCP_CA_Loss            4
 
-struct tcp_info
-{
+struct tcp_info {
        uint8_t tcpi_state;
        uint8_t tcpi_ca_state;
        uint8_t tcpi_retransmits;
@@ -192,8 +191,7 @@ struct tcp_info
 
 #define TCP_MD5SIG_MAXKEYLEN    80
 
-struct tcp_md5sig
-{
+struct tcp_md5sig {
        struct sockaddr_storage tcpm_addr;
        uint16_t __tcpm_pad1;
        uint16_t tcpm_keylen;

diff --git a/include/poll.h b/include/poll.h
index 7af7372..daccc76 100644 (file)
--- a/include/poll.h
+++ b/include/poll.h
@@ -28,8 +28,7 @@ extern "C" {
 
 typedef unsigned long nfds_t;
 
-struct pollfd
-{
+struct pollfd {
        int fd;
        short events;
        short revents;

diff --git a/include/pwd.h b/include/pwd.h
index 55d9d42..07a5871 100644 (file)
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -17,8 +17,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct passwd
-{
+struct passwd {
        char *pw_name;
        char *pw_passwd;
        uid_t pw_uid;

diff --git a/include/sys/acct.h b/include/sys/acct.h
index ee576c4..9b0ba36 100644 (file)
--- a/include/sys/acct.h
+++ b/include/sys/acct.h
@@ -14,8 +14,7 @@ extern "C" {
 
 typedef uint16_t comp_t;
 
-struct acct
-{
+struct acct {
        char ac_flag;
        uint16_t ac_uid;
        uint16_t ac_gid;
@@ -36,8 +35,7 @@ struct acct
 };
 
 
-struct acct_v3
-{
+struct acct_v3 {
        char ac_flag;
        char ac_version;
        uint16_t ac_tty;

diff --git a/include/sys/procfs.h b/include/sys/procfs.h
index 2a92875..e23bf1a 100644 (file)
--- a/include/sys/procfs.h
+++ b/include/sys/procfs.h
@@ -33,8 +33,7 @@ struct elf_prstatus {
 
 #define ELF_PRARGSZ 80
 
-struct elf_prpsinfo
-{
+struct elf_prpsinfo {
        char pr_state;
        char pr_sname;
        char pr_zomb;

diff --git a/include/sys/quota.h b/include/sys/quota.h
index a06f335..3ed7378 100644 (file)
--- a/include/sys/quota.h
+++ b/include/sys/quota.h
@@ -57,8 +57,7 @@ extern "C" {
 #define QIF_TIMES      (QIF_BTIME | QIF_ITIME)
 #define QIF_ALL                (QIF_LIMITS | QIF_USAGE | QIF_TIMES)
 
-struct dqblk
-{
+struct dqblk {
        uint64_t dqb_bhardlimit;
        uint64_t dqb_bsoftlimit;
        uint64_t dqb_curspace;
@@ -87,8 +86,7 @@ struct dqblk
 #define IIF_FLAGS      4
 #define IIF_ALL                (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
 
-struct dqinfo
-{
+struct dqinfo {
        uint64_t dqi_bgrace;
        uint64_t dqi_igrace;
        uint32_t dqi_flags;

diff --git a/include/sys/resource.h b/include/sys/resource.h
index 6f22a2e..70d793d 100644 (file)
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -19,14 +19,12 @@ extern "C" {
 
 typedef unsigned long long rlim_t;
 
-struct rlimit
-{
+struct rlimit {
        rlim_t rlim_cur;
        rlim_t rlim_max;
 };
 
-struct rusage
-{
+struct rusage {
        struct timeval ru_utime;
        struct timeval ru_stime;
        /* linux extentions, but useful */

diff --git a/include/sys/socket.h b/include/sys/socket.h
index 55e53d2..59ab1e2 100644 (file)
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -20,15 +20,13 @@ extern "C" {
 #include <bits/socket.h>
 
 #ifdef _GNU_SOURCE
-struct ucred
-{
+struct ucred {
        pid_t pid;
        uid_t uid;
        gid_t gid;
 };
 
-struct mmsghdr
-{
+struct mmsghdr {
        struct msghdr msg_hdr;
        unsigned int  msg_len;
 };
@@ -39,8 +37,7 @@ int sendmmsg (int, struct mmsghdr *, unsigned int, unsigned int);
 int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
 #endif
 
-struct linger
-{
+struct linger {
        int l_onoff;
        int l_linger;
 };
@@ -297,14 +294,12 @@ struct linger
 #define SCM_RIGHTS      0x01
 #define SCM_CREDENTIALS 0x02
 
-struct sockaddr
-{
+struct sockaddr {
        sa_family_t sa_family;
        char sa_data[14];
 };
 
-struct sockaddr_storage
-{
+struct sockaddr_storage {
        sa_family_t ss_family;
        char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
        unsigned long __ss_align;

diff --git a/include/sys/time.h b/include/sys/time.h
index bfe1414..e4b379a 100644 (file)
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -17,8 +17,7 @@ int gettimeofday (struct timeval *__restrict, void *__restrict);
 #define ITIMER_VIRTUAL 1
 #define ITIMER_PROF    2
 
-struct itimerval
-{
+struct itimerval {
        struct timeval it_interval;
        struct timeval it_value;
 };

diff --git a/include/sys/times.h b/include/sys/times.h
index cc55e57..80a5052 100644 (file)
--- a/include/sys/times.h
+++ b/include/sys/times.h
@@ -8,8 +8,7 @@ extern "C" {
 #define __NEED_clock_t
 #include <bits/alltypes.h>
 
-struct tms
-{
+struct tms {
        clock_t tms_utime;
        clock_t tms_stime;
        clock_t tms_cutime;

diff --git a/include/sys/un.h b/include/sys/un.h
index 7494f1a..1a3193a 100644 (file)
--- a/include/sys/un.h
+++ b/include/sys/un.h
@@ -14,8 +14,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct sockaddr_un
-{
+struct sockaddr_un {
        sa_family_t sun_family;
        char sun_path[108];
 };

diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index 6b9ea97..2c80fb5 100644 (file)
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -7,8 +7,7 @@ extern "C" {
 
 #include <features.h>
 
-struct utsname
-{
+struct utsname {
        char sysname[65];
        char nodename[65];
        char release[65];

diff --git a/include/time.h b/include/time.h
index 16ec08a..a408679 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -35,8 +35,7 @@ extern "C" {
 #define __tm_zone tm_zone
 #endif
 
-struct tm
-{
+struct tm {
        int tm_sec;
        int tm_min;
        int tm_hour;
@@ -78,8 +77,7 @@ char *ctime_r (const time_t *, char *);
 
 void tzset (void);
 
-struct itimerspec
-{
+struct itimerspec {
        struct timespec it_interval;
        struct timespec it_value;
 };

diff --git a/include/utime.h b/include/utime.h
index ec82e0f..dd5ff92 100644 (file)
--- a/include/utime.h
+++ b/include/utime.h
@@ -9,8 +9,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct utimbuf
-{
+struct utimbuf {
        time_t actime;
        time_t modtime;
 };

diff --git a/include/utmpx.h b/include/utmpx.h
index 44b501d..9e5cc95 100644 (file)
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -14,8 +14,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct utmpx
-{
+struct utmpx {
        short ut_type;
        pid_t ut_pid;
        char ut_line[32];