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.

24 files changed, 46 insertions, 92 deletions

diff --git a/include/dirent.h b/include/dirent.h
index 5aa8510b..006a360e 100644
--- 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 ebd5c304..e683e4dc 100644
--- 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 c8eadbc9..b15c062a 100644
--- 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 c1d0df92..35cbd358 100644
--- 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 b331d326..358181bf 100644
--- 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 d03c414a..3492a1d6 100644
--- 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 3f4fc092..1a4059d6 100644
--- 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 47940684..967ca211 100644
--- 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 04cc81cd..f6bb77b1 100644
--- 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 d6f41cab..9ea64c45 100644
--- 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 7af73722..daccc760 100644
--- 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 55d9d42d..07a5871d 100644
--- 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 ee576c4a..9b0ba36f 100644
--- 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 2a928751..e23bf1ad 100644
--- 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 a06f335a..3ed73785 100644
--- 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 6f22a2e7..70d793d5 100644
--- 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 55e53d2a..59ab1e2f 100644
--- 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 bfe1414e..e4b379ae 100644
--- 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 cc55e573..80a50522 100644
--- 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 7494f1a3..1a3193ad 100644
--- 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 6b9ea970..2c80fb5a 100644
--- 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 16ec08ae..a408679c 100644
--- 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 ec82e0f3..dd5ff927 100644
--- 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 44b501d3..9e5cc955 100644
--- 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];