summaryrefslogtreecommitdiff
path: root/include/netinet
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2016-07-03 14:40:11 -0400
committerRich Felker <dalias@aerifal.cx>2016-07-03 15:02:25 -0400
commitbefa5866ee30d09c0c96e88af2eabff5911342ea (patch)
treea72045d740e0a4b204ef6d742f7f3a3ca12e6c0e /include/netinet
parent093288dcb37a30c634b0a00eb7e2a0dbe72ebf95 (diff)
downloadmusl-befa5866ee30d09c0c96e88af2eabff5911342ea.tar.gz
musl-befa5866ee30d09c0c96e88af2eabff5911342ea.tar.bz2
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 'include/netinet')
-rw-r--r--include/netinet/in.h30
-rw-r--r--include/netinet/tcp.h6
2 files changed, 12 insertions, 24 deletions
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;