fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-24 23:02:14 +00:00
Code Issues Projects Releases Wiki Activity

make brace placement in public header struct definitions consistent

Browse Source 
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.
This commit is contained in:
Rich Felker 2016-07-03 14:40:11 -04:00
parent 093288dcb3
commit befa5866ee
68 changed files with 100 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/aarch64/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/aarch64/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
time_t msg_stime; time_t msg_stime;
time_t msg_rtime; time_t msg_rtime;

3
arch/aarch64/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

6
arch/aarch64/bits/socket.h
View File

@ -1,7 +1,6 @@
#include <endian.h> #include <endian.h>
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -21,8 +20,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
int __pad1; int __pad1;
socklen_t cmsg_len; socklen_t cmsg_len;

3
arch/arm/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
int __st_dev_padding; int __st_dev_padding;
long __st_ino_truncated; long __st_ino_truncated;

3
arch/generic/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/generic/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
time_t msg_stime; time_t msg_stime;
int __unused1; int __unused1;

3
arch/generic/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

6
arch/generic/bits/socket.h
View File

@ -1,5 +1,4 @@
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -9,8 +8,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
socklen_t cmsg_len; socklen_t cmsg_len;
int cmsg_level; int cmsg_level;
int cmsg_type; int cmsg_type;

3
arch/generic/bits/termios.h
View File

@ -1,5 +1,4 @@
struct termios struct termios {
{
tcflag_t c_iflag; tcflag_t c_iflag;
tcflag_t c_oflag; tcflag_t c_oflag;
tcflag_t c_cflag; tcflag_t c_cflag;

3
arch/i386/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
int __st_dev_padding; int __st_dev_padding;
long __st_ino_truncated; long __st_ino_truncated;

6
arch/i386/bits/user.h
View File

@ -13,8 +13,7 @@ typedef struct user_fpxregs_struct
long st_space[32], xmm_space[32], padding[56]; long st_space[32], xmm_space[32], padding[56];
} elf_fpxregset_t; } elf_fpxregset_t;
struct user_regs_struct struct user_regs_struct {
{
long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs; long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs;
long orig_eax, eip, xcs, eflags, esp, xss; long orig_eax, eip, xcs, eflags, esp, xss;
}; };
@ -22,8 +21,7 @@ struct user_regs_struct
#define ELF_NGREG 17 #define ELF_NGREG 17
typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG]; typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
struct user struct user {
{
struct user_regs_struct regs; struct user_regs_struct regs;
int u_fpvalid; int u_fpvalid;
struct user_fpregs_struct i387; struct user_fpregs_struct i387;

3
arch/microblaze/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
ino_t st_ino; ino_t st_ino;
mode_t st_mode; mode_t st_mode;

3
arch/mips/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
#if _MIPSEL || __MIPSEL || __MIPSEL__ #if _MIPSEL || __MIPSEL || __MIPSEL__
time_t msg_stime; time_t msg_stime;

3
arch/mips/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

3
arch/mips/bits/signal.h
View File

@ -17,8 +17,7 @@ typedef struct {
} fp_fregs[32]; } fp_fregs[32];
} fp_r; } fp_r;
} fpregset_t; } fpregset_t;
struct sigcontext struct sigcontext {
{
unsigned sc_regmask, sc_status; unsigned sc_regmask, sc_status;
unsigned long long sc_pc, sc_regs[32], sc_fpregs[32]; 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; unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;

6
arch/mips/bits/socket.h
View File

@ -1,5 +1,4 @@
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -9,8 +8,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
socklen_t cmsg_len; socklen_t cmsg_len;
int cmsg_level; int cmsg_level;
int cmsg_type; int cmsg_type;

3
arch/mips/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
long __st_padding1[2]; long __st_padding1[2];
ino_t st_ino; ino_t st_ino;

3
arch/mipsn32/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
#if _MIPSEL || __MIPSEL || __MIPSEL__ #if _MIPSEL || __MIPSEL || __MIPSEL__
time_t msg_stime; time_t msg_stime;

3
arch/powerpc/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/powerpc/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
int __unused1; int __unused1;
time_t msg_stime; time_t msg_stime;

3
arch/powerpc/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
int __unused1; int __unused1;
time_t shm_atime; time_t shm_atime;

3
arch/powerpc/bits/signal.h
View File

@ -23,8 +23,7 @@ typedef struct {
unsigned vscr; unsigned vscr;
} vrregset_t; } vrregset_t;
struct sigcontext struct sigcontext {
{
unsigned long _unused[4]; unsigned long _unused[4];
int signal; int signal;
unsigned long handler; unsigned long handler;

6
arch/powerpc/bits/socket.h
View File

@ -1,5 +1,4 @@
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -9,8 +8,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
socklen_t cmsg_len; socklen_t cmsg_len;
int cmsg_level; int cmsg_level;
int cmsg_type; int cmsg_type;

3
arch/powerpc/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
ino_t st_ino; ino_t st_ino;
mode_t st_mode; mode_t st_mode;

3
arch/powerpc/bits/termios.h
View File

@ -1,7 +1,6 @@
#undef NCCS #undef NCCS
#define NCCS 19 #define NCCS 19
struct termios struct termios {
{
tcflag_t c_iflag; tcflag_t c_iflag;
tcflag_t c_oflag; tcflag_t c_oflag;
tcflag_t c_cflag; tcflag_t c_cflag;

3
arch/powerpc64/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/powerpc64/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
time_t msg_stime; time_t msg_stime;
time_t msg_rtime; time_t msg_rtime;

3
arch/powerpc64/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
time_t shm_atime; time_t shm_atime;
time_t shm_dtime; time_t shm_dtime;

6
arch/powerpc64/bits/socket.h
View File

@ -1,7 +1,6 @@
#include <endian.h> #include <endian.h>
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -21,8 +20,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
int __pad1; int __pad1;
socklen_t cmsg_len; socklen_t cmsg_len;

3
arch/powerpc64/bits/stat.h
View File

@ -1,5 +1,4 @@
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
ino_t st_ino; ino_t st_ino;
nlink_t st_nlink; nlink_t st_nlink;

3
arch/powerpc64/bits/termios.h
View File

@ -1,7 +1,6 @@
#undef NCCS #undef NCCS
#define NCCS 19 #define NCCS 19
struct termios struct termios {
{
tcflag_t c_iflag; tcflag_t c_iflag;
tcflag_t c_oflag; tcflag_t c_oflag;
tcflag_t c_cflag; tcflag_t c_cflag;

3
arch/sh/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 16384 #define SHMLBA 16384
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

3
arch/sh/bits/stat.h
View File

@ -1,8 +1,7 @@
/* copied from kernel definition, but with padding replaced /* copied from kernel definition, but with padding replaced
* by the corresponding correctly-sized userspace types. */ * by the corresponding correctly-sized userspace types. */
struct stat struct stat {
{
dev_t st_dev; dev_t st_dev;
int __st_dev_padding; int __st_dev_padding;
long __st_ino_truncated; long __st_ino_truncated;

3
arch/x32/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/x32/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
time_t msg_stime; time_t msg_stime;
time_t msg_rtime; time_t msg_rtime;

3
arch/x32/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

6
arch/x32/bits/socket.h
View File

@ -1,5 +1,4 @@
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -9,8 +8,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
socklen_t cmsg_len; socklen_t cmsg_len;
int __pad1; int __pad1;
int cmsg_level; int cmsg_level;

6
arch/x32/bits/user.h
View File

@ -9,8 +9,7 @@ typedef struct user_fpregs_struct
uint32_t st_space[32], xmm_space[64], padding[24]; uint32_t st_space[32], xmm_space[64], padding[24];
} elf_fpregset_t; } 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 r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip; unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs; 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 #define ELF_NGREG 27
typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG]; typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
struct user struct user {
{
struct user_regs_struct regs; struct user_regs_struct regs;
int u_fpvalid; int u_fpvalid;
struct user_fpregs_struct i387; struct user_fpregs_struct i387;

3
arch/x86_64/bits/ipc.h
View File

@ -1,5 +1,4 @@
struct ipc_perm struct ipc_perm {
{
key_t __ipc_perm_key; key_t __ipc_perm_key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

3
arch/x86_64/bits/msg.h
View File

@ -1,5 +1,4 @@
struct msqid_ds struct msqid_ds {
{
struct ipc_perm msg_perm; struct ipc_perm msg_perm;
time_t msg_stime; time_t msg_stime;
time_t msg_rtime; time_t msg_rtime;

3
arch/x86_64/bits/shm.h
View File

@ -1,7 +1,6 @@
#define SHMLBA 4096 #define SHMLBA 4096
struct shmid_ds struct shmid_ds {
{
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
size_t shm_segsz; size_t shm_segsz;
time_t shm_atime; time_t shm_atime;

6
arch/x86_64/bits/socket.h
View File

@ -1,5 +1,4 @@
struct msghdr struct msghdr {
{
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
@ -9,8 +8,7 @@ struct msghdr
int msg_flags; int msg_flags;
}; };
struct cmsghdr struct cmsghdr {
{
socklen_t cmsg_len; socklen_t cmsg_len;
int __pad1; int __pad1;
int cmsg_level; int cmsg_level;

6
arch/x86_64/bits/user.h
View File

@ -9,8 +9,7 @@ typedef struct user_fpregs_struct
uint32_t st_space[32], xmm_space[64], padding[24]; uint32_t st_space[32], xmm_space[64], padding[24];
} elf_fpregset_t; } 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 r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip; unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs; 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 #define ELF_NGREG 27
typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG]; typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
struct user struct user {
{
struct user_regs_struct regs; struct user_regs_struct regs;
int u_fpvalid; int u_fpvalid;
struct user_fpregs_struct i387; struct user_fpregs_struct i387;

3
include/dirent.h
View File

@ -17,8 +17,7 @@ extern "C" {
typedef struct __dirstream DIR; typedef struct __dirstream DIR;
struct dirent struct dirent {
{
ino_t d_ino; ino_t d_ino;
off_t d_off; off_t d_off;
unsigned short d_reclen; unsigned short d_reclen;

3
include/fcntl.h
View File

@ -21,8 +21,7 @@ extern "C" {
#include <bits/fcntl.h> #include <bits/fcntl.h>
struct flock struct flock {
{
short l_type; short l_type;
short l_whence; short l_whence;
off_t l_start; off_t l_start;

3
include/ftw.h
View File

@ -21,8 +21,7 @@ extern "C" {
#define FTW_CHDIR 4 #define FTW_CHDIR 4
#define FTW_DEPTH 8 #define FTW_DEPTH 8
struct FTW struct FTW {
{
int base; int base;
int level; int level;
}; };

3
include/getopt.h
View File

@ -9,8 +9,7 @@ int getopt(int, char * const [], const char *);
extern char *optarg; extern char *optarg;
extern int optind, opterr, optopt, optreset; extern int optind, opterr, optopt, optreset;
struct option struct option {
{
const char *name; const char *name;
int has_arg; int has_arg;
int *flag; int *flag;

3
include/grp.h
View File

@ -16,8 +16,7 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct group struct group {
{
char *gr_name; char *gr_name;
char *gr_passwd; char *gr_passwd;
gid_t gr_gid; gid_t gr_gid;

3
include/mntent.h
View File

@ -20,8 +20,7 @@ extern "C" {
#define MNTOPT_NOSUID "nosuid" #define MNTOPT_NOSUID "nosuid"
#define MNTOPT_NOAUTO "noauto" #define MNTOPT_NOAUTO "noauto"
struct mntent struct mntent {
{
char *mnt_fsname; char *mnt_fsname;
char *mnt_dir; char *mnt_dir;
char *mnt_type; char *mnt_type;

3
include/net/if.h
View File

@ -9,8 +9,7 @@ extern "C" {
#define IF_NAMESIZE 16 #define IF_NAMESIZE 16
struct if_nameindex struct if_nameindex {
{
unsigned int if_index; unsigned int if_index;
char *if_name; char *if_name;
}; };

15
include/netdb.h
View File

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

30
include/netinet/in.h
View File

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

6
include/netinet/tcp.h
View File

@ -145,8 +145,7 @@ struct tcphdr {
#define TCP_CA_Recovery 3 #define TCP_CA_Recovery 3
#define TCP_CA_Loss 4 #define TCP_CA_Loss 4
struct tcp_info struct tcp_info {
{
uint8_t tcpi_state; uint8_t tcpi_state;
uint8_t tcpi_ca_state; uint8_t tcpi_ca_state;
uint8_t tcpi_retransmits; uint8_t tcpi_retransmits;
@ -192,8 +191,7 @@ struct tcp_info
#define TCP_MD5SIG_MAXKEYLEN 80 #define TCP_MD5SIG_MAXKEYLEN 80
struct tcp_md5sig struct tcp_md5sig {
{
struct sockaddr_storage tcpm_addr; struct sockaddr_storage tcpm_addr;
uint16_t __tcpm_pad1; uint16_t __tcpm_pad1;
uint16_t tcpm_keylen; uint16_t tcpm_keylen;

3
include/poll.h
View File

@ -28,8 +28,7 @@ extern "C" {
typedef unsigned long nfds_t; typedef unsigned long nfds_t;
struct pollfd struct pollfd {
{
int fd; int fd;
short events; short events;
short revents; short revents;

3
include/pwd.h
View File

@ -17,8 +17,7 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct passwd struct passwd {
{
char *pw_name; char *pw_name;
char *pw_passwd; char *pw_passwd;
uid_t pw_uid; uid_t pw_uid;

6
include/sys/acct.h
View File

@ -14,8 +14,7 @@ extern "C" {
typedef uint16_t comp_t; typedef uint16_t comp_t;
struct acct struct acct {
{
char ac_flag; char ac_flag;
uint16_t ac_uid; uint16_t ac_uid;
uint16_t ac_gid; uint16_t ac_gid;
@ -36,8 +35,7 @@ struct acct
}; };
struct acct_v3 struct acct_v3 {
{
char ac_flag; char ac_flag;
char ac_version; char ac_version;
uint16_t ac_tty; uint16_t ac_tty;

3
include/sys/procfs.h
View File

@ -33,8 +33,7 @@ struct elf_prstatus {
#define ELF_PRARGSZ 80 #define ELF_PRARGSZ 80
struct elf_prpsinfo struct elf_prpsinfo {
{
char pr_state; char pr_state;
char pr_sname; char pr_sname;
char pr_zomb; char pr_zomb;

6
include/sys/quota.h
View File

@ -57,8 +57,7 @@ extern "C" {
#define QIF_TIMES (QIF_BTIME | QIF_ITIME) #define QIF_TIMES (QIF_BTIME | QIF_ITIME)
#define QIF_ALL (QIF_LIMITS | QIF_USAGE | QIF_TIMES) #define QIF_ALL (QIF_LIMITS | QIF_USAGE | QIF_TIMES)
struct dqblk struct dqblk {
{
uint64_t dqb_bhardlimit; uint64_t dqb_bhardlimit;
uint64_t dqb_bsoftlimit; uint64_t dqb_bsoftlimit;
uint64_t dqb_curspace; uint64_t dqb_curspace;
@ -87,8 +86,7 @@ struct dqblk
#define IIF_FLAGS 4 #define IIF_FLAGS 4
#define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) #define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
struct dqinfo struct dqinfo {
{
uint64_t dqi_bgrace; uint64_t dqi_bgrace;
uint64_t dqi_igrace; uint64_t dqi_igrace;
uint32_t dqi_flags; uint32_t dqi_flags;

6
include/sys/resource.h
View File

@ -19,14 +19,12 @@ extern "C" {
typedef unsigned long long rlim_t; typedef unsigned long long rlim_t;
struct rlimit struct rlimit {
{
rlim_t rlim_cur; rlim_t rlim_cur;
rlim_t rlim_max; rlim_t rlim_max;
}; };
struct rusage struct rusage {
{
struct timeval ru_utime; struct timeval ru_utime;
struct timeval ru_stime; struct timeval ru_stime;
/* linux extentions, but useful */ /* linux extentions, but useful */

15
include/sys/socket.h
View File

@ -20,15 +20,13 @@ extern "C" {
#include <bits/socket.h> #include <bits/socket.h>
#ifdef _GNU_SOURCE #ifdef _GNU_SOURCE
struct ucred struct ucred {
{
pid_t pid; pid_t pid;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
}; };
struct mmsghdr struct mmsghdr {
{
struct msghdr msg_hdr; struct msghdr msg_hdr;
unsigned int msg_len; 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 *); int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
#endif #endif
struct linger struct linger {
{
int l_onoff; int l_onoff;
int l_linger; int l_linger;
}; };
@ -297,14 +294,12 @@ struct linger
#define SCM_RIGHTS 0x01 #define SCM_RIGHTS 0x01
#define SCM_CREDENTIALS 0x02 #define SCM_CREDENTIALS 0x02
struct sockaddr struct sockaddr {
{
sa_family_t sa_family; sa_family_t sa_family;
char sa_data[14]; char sa_data[14];
}; };
struct sockaddr_storage struct sockaddr_storage {
{
sa_family_t ss_family; sa_family_t ss_family;
char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)]; char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
unsigned long __ss_align; unsigned long __ss_align;

3
include/sys/time.h
View File

@ -17,8 +17,7 @@ int gettimeofday (struct timeval *__restrict, void *__restrict);
#define ITIMER_VIRTUAL 1 #define ITIMER_VIRTUAL 1
#define ITIMER_PROF 2 #define ITIMER_PROF 2
struct itimerval struct itimerval {
{
struct timeval it_interval; struct timeval it_interval;
struct timeval it_value; struct timeval it_value;
}; };

3
include/sys/times.h
View File

@ -8,8 +8,7 @@ extern "C" {
#define __NEED_clock_t #define __NEED_clock_t
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct tms struct tms {
{
clock_t tms_utime; clock_t tms_utime;
clock_t tms_stime; clock_t tms_stime;
clock_t tms_cutime; clock_t tms_cutime;

3
include/sys/un.h
View File

@ -14,8 +14,7 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct sockaddr_un struct sockaddr_un {
{
sa_family_t sun_family; sa_family_t sun_family;
char sun_path[108]; char sun_path[108];
}; };

3
include/sys/utsname.h
View File

@ -7,8 +7,7 @@ extern "C" {
#include <features.h> #include <features.h>
struct utsname struct utsname {
{
char sysname[65]; char sysname[65];
char nodename[65]; char nodename[65];
char release[65]; char release[65];

6
include/time.h
View File

@ -35,8 +35,7 @@ extern "C" {
#define __tm_zone tm_zone #define __tm_zone tm_zone
#endif #endif
struct tm struct tm {
{
int tm_sec; int tm_sec;
int tm_min; int tm_min;
int tm_hour; int tm_hour;
@ -78,8 +77,7 @@ char *ctime_r (const time_t *, char *);
void tzset (void); void tzset (void);
struct itimerspec struct itimerspec {
{
struct timespec it_interval; struct timespec it_interval;
struct timespec it_value; struct timespec it_value;
}; };

3
include/utime.h
View File

@ -9,8 +9,7 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct utimbuf struct utimbuf {
{
time_t actime; time_t actime;
time_t modtime; time_t modtime;
}; };

3
include/utmpx.h
View File

@ -14,8 +14,7 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct utmpx struct utmpx {
{
short ut_type; short ut_type;
pid_t ut_pid; pid_t ut_pid;
char ut_line[32]; char ut_line[32];