Use XLAT macro

Automatically convert all xlat structures to XLAT form
using the following sed regexp:
s/^[[:space:]]*{[[:space:]]*\([^",}[:space:]]\+\)[[:space:]]*,[[:space:]]*"\1",\?[[:space:]]*}[[:space:]]*/\tXLAT(\1)/

1 files changed, 373 insertions, 373 deletions

diff --git a/net.c b/net.c
index b6c8cc9..cb328be 100644
--- a/net.c
+++ b/net.c
@@ -96,282 +96,282 @@
 
 static const struct xlat domains[] = {
 #ifdef PF_UNSPEC
-	{ PF_UNSPEC,	"PF_UNSPEC"	},
+	XLAT(PF_UNSPEC),
 #endif
 #ifdef PF_LOCAL
-	{ PF_LOCAL,	"PF_LOCAL"	},
+	XLAT(PF_LOCAL),
 #endif
 #ifdef PF_UNIX
-	{ PF_UNIX,	"PF_UNIX"	},
+	XLAT(PF_UNIX),
 #endif
 #ifdef PF_INET
-	{ PF_INET,	"PF_INET"	},
+	XLAT(PF_INET),
 #endif
 #ifdef PF_AX25
-	{ PF_AX25,	"PF_AX25"	},
+	XLAT(PF_AX25),
 #endif
 #ifdef PF_IPX
-	{ PF_IPX,	"PF_IPX"	},
+	XLAT(PF_IPX),
 #endif
 #ifdef PF_APPLETALK
-	{ PF_APPLETALK,	"PF_APPLETALK"	},
+	XLAT(PF_APPLETALK),
 #endif
 #ifdef PF_NETROM
-	{ PF_NETROM,	"PF_NETROM"	},
+	XLAT(PF_NETROM),
 #endif
 #ifdef PF_BRIDGE
-	{ PF_BRIDGE,	"PF_BRIDGE"	},
+	XLAT(PF_BRIDGE),
 #endif
 #ifdef PF_ATMPVC
-	{ PF_ATMPVC,	"PF_ATMPVC"	},
+	XLAT(PF_ATMPVC),
 #endif
 #ifdef PF_X25
-	{ PF_X25,	"PF_X25"	},
+	XLAT(PF_X25),
 #endif
 #ifdef PF_INET6
-	{ PF_INET6,	"PF_INET6"	},
+	XLAT(PF_INET6),
 #endif
 #ifdef PF_ROSE
-	{ PF_ROSE,	"PF_ROSE"	},
+	XLAT(PF_ROSE),
 #endif
 #ifdef PF_DECnet
-	{ PF_DECnet,	"PF_DECnet"	},
+	XLAT(PF_DECnet),
 #endif
 #ifdef PF_NETBEUI
-	{ PF_NETBEUI,	"PF_NETBEUI"	},
+	XLAT(PF_NETBEUI),
 #endif
 #ifdef PF_SECURITY
-	{ PF_SECURITY,	"PF_SECURITY"	},
+	XLAT(PF_SECURITY),
 #endif
 #ifdef PF_KEY
-	{ PF_KEY,	"PF_KEY"	},
+	XLAT(PF_KEY),
 #endif
 #ifdef PF_NETLINK
-	{ PF_NETLINK,	"PF_NETLINK"	},
+	XLAT(PF_NETLINK),
 #endif
 #ifdef PF_ROUTE
-	{ PF_ROUTE,	"PF_ROUTE"	},
+	XLAT(PF_ROUTE),
 #endif
 #ifdef PF_PACKET
-	{ PF_PACKET,	"PF_PACKET"	},
+	XLAT(PF_PACKET),
 #endif
 #ifdef PF_ASH
-	{ PF_ASH,	"PF_ASH"	},
+	XLAT(PF_ASH),
 #endif
 #ifdef PF_ECONET
-	{ PF_ECONET,	"PF_ECONET"	},
+	XLAT(PF_ECONET),
 #endif
 #ifdef PF_ATMSVC
-	{ PF_ATMSVC,	"PF_ATMSVC"	},
+	XLAT(PF_ATMSVC),
 #endif
 #ifdef PF_RDS
-	{ PF_RDS,	"PF_RDS"	},
+	XLAT(PF_RDS),
 #endif
 #ifdef PF_SNA
-	{ PF_SNA,	"PF_SNA"	},
+	XLAT(PF_SNA),
 #endif
 #ifdef PF_IRDA
-	{ PF_IRDA,	"PF_IRDA"	},
+	XLAT(PF_IRDA),
 #endif
 #ifdef PF_PPPOX
-	{ PF_PPPOX,	"PF_PPPOX"	},
+	XLAT(PF_PPPOX),
 #endif
 #ifdef PF_WANPIPE
-	{ PF_WANPIPE,	"PF_WANPIPE"	},
+	XLAT(PF_WANPIPE),
 #endif
 #ifdef PF_LLC
-	{ PF_LLC,	"PF_LLC"	},
+	XLAT(PF_LLC),
 #endif
 #ifdef PF_CAN
-	{ PF_CAN,	"PF_CAN"	},
+	XLAT(PF_CAN),
 #endif
 #ifdef PF_TIPC
-	{ PF_TIPC,	"PF_TIPC"	},
+	XLAT(PF_TIPC),
 #endif
 #ifdef PF_BLUETOOTH
-	{ PF_BLUETOOTH,	"PF_BLUETOOTH"	},
+	XLAT(PF_BLUETOOTH),
 #endif
 #ifdef PF_IUCV
-	{ PF_IUCV,	"PF_IUCV"	},
+	XLAT(PF_IUCV),
 #endif
 #ifdef PF_RXRPC
-	{ PF_RXRPC,	"PF_RXRPC"	},
+	XLAT(PF_RXRPC),
 #endif
 #ifdef PF_ISDN
-	{ PF_ISDN,	"PF_ISDN"	},
+	XLAT(PF_ISDN),
 #endif
 #ifdef PF_PHONET
-	{ PF_PHONET,	"PF_PHONET"	},
+	XLAT(PF_PHONET),
 #endif
 #ifdef PF_IEEE802154
-	{ PF_IEEE802154,"PF_IEEE802154"	},
+	XLAT(PF_IEEE802154),
 #endif
 #ifdef PF_CAIF
-	{ PF_CAIF,	"PF_CAIF"	},
+	XLAT(PF_CAIF),
 #endif
 #ifdef PF_ALG
-	{ PF_ALG,	"PF_ALG"	},
+	XLAT(PF_ALG),
 #endif
 #ifdef PF_NFC
-	{ PF_NFC,	"PF_NFC"	},
+	XLAT(PF_NFC),
 #endif
 #ifdef PF_VSOCK
-	{ PF_VSOCK,	"PF_VSOCK"	},
+	XLAT(PF_VSOCK),
 #endif
 	{ 0,		NULL		},
 };
 const struct xlat addrfams[] = {
 #ifdef AF_UNSPEC
-	{ AF_UNSPEC,	"AF_UNSPEC"	},
+	XLAT(AF_UNSPEC),
 #endif
 #ifdef AF_LOCAL
-	{ AF_LOCAL,	"AF_LOCAL"	},
+	XLAT(AF_LOCAL),
 #endif
 #ifdef AF_UNIX
-	{ AF_UNIX,	"AF_UNIX"	},
+	XLAT(AF_UNIX),
 #endif
 #ifdef AF_INET
-	{ AF_INET,	"AF_INET"	},
+	XLAT(AF_INET),
 #endif
 #ifdef AF_AX25
-	{ AF_AX25,	"AF_AX25"	},
+	XLAT(AF_AX25),
 #endif
 #ifdef AF_IPX
-	{ AF_IPX,	"AF_IPX"	},
+	XLAT(AF_IPX),
 #endif
 #ifdef AF_APPLETALK
-	{ AF_APPLETALK,	"AF_APPLETALK"	},
+	XLAT(AF_APPLETALK),
 #endif
 #ifdef AF_NETROM
-	{ AF_NETROM,	"AF_NETROM"	},
+	XLAT(AF_NETROM),
 #endif
 #ifdef AF_BRIDGE
-	{ AF_BRIDGE,	"AF_BRIDGE"	},
+	XLAT(AF_BRIDGE),
 #endif
 #ifdef AF_ATMPVC
-	{ AF_ATMPVC,	"AF_ATMPVC"	},
+	XLAT(AF_ATMPVC),
 #endif
 #ifdef AF_X25
-	{ AF_X25,	"AF_X25"	},
+	XLAT(AF_X25),
 #endif
 #ifdef AF_INET6
-	{ AF_INET6,	"AF_INET6"	},
+	XLAT(AF_INET6),
 #endif
 #ifdef AF_ROSE
-	{ AF_ROSE,	"AF_ROSE"	},
+	XLAT(AF_ROSE),
 #endif
 #ifdef AF_DECnet
-	{ AF_DECnet,	"AF_DECnet"	},
+	XLAT(AF_DECnet),
 #endif
 #ifdef AF_NETBEUI
-	{ AF_NETBEUI,	"AF_NETBEUI"	},
+	XLAT(AF_NETBEUI),
 #endif
 #ifdef AF_SECURITY
-	{ AF_SECURITY,	"AF_SECURITY"	},
+	XLAT(AF_SECURITY),
 #endif
 #ifdef AF_KEY
-	{ AF_KEY,	"AF_KEY"	},
+	XLAT(AF_KEY),
 #endif
 #ifdef AF_NETLINK
-	{ AF_NETLINK,	"AF_NETLINK"	},
+	XLAT(AF_NETLINK),
 #endif
 #ifdef AF_ROUTE
-	{ AF_ROUTE,	"AF_ROUTE"	},
+	XLAT(AF_ROUTE),
 #endif
 #ifdef AF_PACKET
-	{ AF_PACKET,	"AF_PACKET"	},
+	XLAT(AF_PACKET),
 #endif
 #ifdef AF_ASH
-	{ AF_ASH,	"AF_ASH"	},
+	XLAT(AF_ASH),
 #endif
 #ifdef AF_ECONET
-	{ AF_ECONET,	"AF_ECONET"	},
+	XLAT(AF_ECONET),
 #endif
 #ifdef AF_ATMSVC
-	{ AF_ATMSVC,	"AF_ATMSVC"	},
+	XLAT(AF_ATMSVC),
 #endif
 #ifdef AF_RDS
-	{ AF_RDS,	"AF_RDS"	},
+	XLAT(AF_RDS),
 #endif
 #ifdef AF_SNA
-	{ AF_SNA,	"AF_SNA"	},
+	XLAT(AF_SNA),
 #endif
 #ifdef AF_IRDA
-	{ AF_IRDA,	"AF_IRDA"	},
+	XLAT(AF_IRDA),
 #endif
 #ifdef AF_PPPOX
-	{ AF_PPPOX,	"AF_PPPOX"	},
+	XLAT(AF_PPPOX),
 #endif
 #ifdef AF_WANPIPE
-	{ AF_WANPIPE,	"AF_WANPIPE"	},
+	XLAT(AF_WANPIPE),
 #endif
 #ifdef AF_LLC
-	{ AF_LLC,	"AF_LLC"	},
+	XLAT(AF_LLC),
 #endif
 #ifdef AF_CAN
-	{ AF_CAN,	"AF_CAN"	},
+	XLAT(AF_CAN),
 #endif
 #ifdef AF_TIPC
-	{ AF_TIPC,	"AF_TIPC"	},
+	XLAT(AF_TIPC),
 #endif
 #ifdef AF_BLUETOOTH
-	{ AF_BLUETOOTH,	"AF_BLUETOOTH"	},
+	XLAT(AF_BLUETOOTH),
 #endif
 #ifdef AF_IUCV
-	{ AF_IUCV,	"AF_IUCV"	},
+	XLAT(AF_IUCV),
 #endif
 #ifdef AF_RXRPC
-	{ AF_RXRPC,	"AF_RXRPC"	},
+	XLAT(AF_RXRPC),
 #endif
 #ifdef AF_ISDN
-	{ AF_ISDN,	"AF_ISDN"	},
+	XLAT(AF_ISDN),
 #endif
 #ifdef AF_PHONET
-	{ AF_PHONET,	"AF_PHONET"	},
+	XLAT(AF_PHONET),
 #endif
 #ifdef AF_IEEE802154
-	{ AF_IEEE802154,"AF_IEEE802154"	},
+	XLAT(AF_IEEE802154),
 #endif
 #ifdef AF_CAIF
-	{ AF_CAIF,	"AF_CAIF"	},
+	XLAT(AF_CAIF),
 #endif
 #ifdef AF_ALG
-	{ AF_ALG,	"AF_ALG"	},
+	XLAT(AF_ALG),
 #endif
 #ifdef AF_NFC
-	{ AF_NFC,	"AF_NFC"	},
+	XLAT(AF_NFC),
 #endif
 #ifdef AF_VSOCK
-	{ AF_VSOCK,	"AF_VSOCK"	},
+	XLAT(AF_VSOCK),
 #endif
 	{ 0,		NULL		},
 };
 static const struct xlat socktypes[] = {
-	{ SOCK_STREAM,	"SOCK_STREAM"	},
-	{ SOCK_DGRAM,	"SOCK_DGRAM"	},
+	XLAT(SOCK_STREAM),
+	XLAT(SOCK_DGRAM),
 #ifdef SOCK_RAW
-	{ SOCK_RAW,	"SOCK_RAW"	},
+	XLAT(SOCK_RAW),
 #endif
 #ifdef SOCK_RDM
-	{ SOCK_RDM,	"SOCK_RDM"	},
+	XLAT(SOCK_RDM),
 #endif
 #ifdef SOCK_SEQPACKET
-	{ SOCK_SEQPACKET,"SOCK_SEQPACKET"},
+	XLAT(SOCK_SEQPACKET),
 #endif
 #ifdef SOCK_DCCP
-	{ SOCK_DCCP,	"SOCK_DCCP"	},
+	XLAT(SOCK_DCCP),
 #endif
 #ifdef SOCK_PACKET
-	{ SOCK_PACKET,	"SOCK_PACKET"	},
+	XLAT(SOCK_PACKET),
 #endif
 	{ 0,		NULL		},
 };
 static const struct xlat sock_type_flags[] = {
 #ifdef SOCK_CLOEXEC
-	{ SOCK_CLOEXEC,	"SOCK_CLOEXEC"	},
+	XLAT(SOCK_CLOEXEC),
 #endif
 #ifdef SOCK_NONBLOCK
-	{ SOCK_NONBLOCK,"SOCK_NONBLOCK"	},
+	XLAT(SOCK_NONBLOCK),
 #endif
 	{ 0,		NULL		},
 };
@@ -380,385 +380,385 @@ static const struct xlat sock_type_flags[] = {
 #endif
 static const struct xlat socketlayers[] = {
 #if defined(SOL_IP)
-	{ SOL_IP,	"SOL_IP"	},
+	XLAT(SOL_IP),
 #endif
 #if defined(SOL_ICMP)
-	{ SOL_ICMP,	"SOL_ICMP"	},
+	XLAT(SOL_ICMP),
 #endif
 #if defined(SOL_TCP)
-	{ SOL_TCP,	"SOL_TCP"	},
+	XLAT(SOL_TCP),
 #endif
 #if defined(SOL_UDP)
-	{ SOL_UDP,	"SOL_UDP"	},
+	XLAT(SOL_UDP),
 #endif
 #if defined(SOL_IPV6)
-	{ SOL_IPV6,	"SOL_IPV6"	},
+	XLAT(SOL_IPV6),
 #endif
 #if defined(SOL_ICMPV6)
-	{ SOL_ICMPV6,	"SOL_ICMPV6"	},
+	XLAT(SOL_ICMPV6),
 #endif
 #if defined(SOL_SCTP)
-	{ SOL_SCTP,	"SOL_SCTP"	},
+	XLAT(SOL_SCTP),
 #endif
 #if defined(SOL_UDPLITE)
-	{ SOL_UDPLITE,	"SOL_UDPLITE"	},
+	XLAT(SOL_UDPLITE),
 #endif
 #if defined(SOL_RAW)
-	{ SOL_RAW,	"SOL_RAW"	},
+	XLAT(SOL_RAW),
 #endif
 #if defined(SOL_IPX)
-	{ SOL_IPX,	"SOL_IPX"	},
+	XLAT(SOL_IPX),
 #endif
 #if defined(SOL_AX25)
-	{ SOL_AX25,	"SOL_AX25"	},
+	XLAT(SOL_AX25),
 #endif
 #if defined(SOL_ATALK)
-	{ SOL_ATALK,	"SOL_ATALK"	},
+	XLAT(SOL_ATALK),
 #endif
 #if defined(SOL_NETROM)
-	{ SOL_NETROM,	"SOL_NETROM"	},
+	XLAT(SOL_NETROM),
 #endif
 #if defined(SOL_ROSE)
-	{ SOL_ROSE,	"SOL_ROSE"	},
+	XLAT(SOL_ROSE),
 #endif
 #if defined(SOL_DECNET)
-	{ SOL_DECNET,	"SOL_DECNET"	},
+	XLAT(SOL_DECNET),
 #endif
 #if defined(SOL_X25)
-	{ SOL_X25,	"SOL_X25"	},
+	XLAT(SOL_X25),
 #endif
 #if defined(SOL_PACKET)
-	{ SOL_PACKET,	"SOL_PACKET"	},
+	XLAT(SOL_PACKET),
 #endif
 #if defined(SOL_ATM)
-	{ SOL_ATM,	"SOL_ATM"	},
+	XLAT(SOL_ATM),
 #endif
 #if defined(SOL_AAL)
-	{ SOL_AAL,	"SOL_AAL"	},
+	XLAT(SOL_AAL),
 #endif
 #if defined(SOL_IRDA)
-	{ SOL_IRDA,	"SOL_IRDA"	},
+	XLAT(SOL_IRDA),
 #endif
 #if defined(SOL_NETBEUI)
-	{ SOL_NETBEUI,	"SOL_NETBEUI"	},
+	XLAT(SOL_NETBEUI),
 #endif
 #if defined(SOL_LLC)
-	{ SOL_LLC,	"SOL_LLC"	},
+	XLAT(SOL_LLC),
 #endif
 #if defined(SOL_DCCP)
-	{ SOL_DCCP,	"SOL_DCCP"	},
+	XLAT(SOL_DCCP),
 #endif
 #if defined(SOL_NETLINK)
-	{ SOL_NETLINK,	"SOL_NETLINK"	},
+	XLAT(SOL_NETLINK),
 #endif
 #if defined(SOL_TIPC)
-	{ SOL_TIPC,	"SOL_TIPC"	},
+	XLAT(SOL_TIPC),
 #endif
 #if defined(SOL_RXRPC)
-	{ SOL_RXRPC,	"SOL_RXRPC"	},
+	XLAT(SOL_RXRPC),
 #endif
 #if defined(SOL_PPPOL2TP)
-	{ SOL_PPPOL2TP,	"SOL_PPPOL2TP"	},
+	XLAT(SOL_PPPOL2TP),
 #endif
 #if defined(SOL_BLUETOOTH)
-	{ SOL_BLUETOOTH,"SOL_BLUETOOTH" },
+	XLAT(SOL_BLUETOOTH),
 #endif
 #if defined(SOL_PNPIPE)
-	{ SOL_PNPIPE,	"SOL_PNPIPE"	},
+	XLAT(SOL_PNPIPE),
 #endif
 #if defined(SOL_RDS)
-	{ SOL_RDS,	"SOL_RDS"	},
+	XLAT(SOL_RDS),
 #endif
 #if defined(SOL_IUVC)
-	{ SOL_IUCV,	"SOL_IUCV"	},
+	XLAT(SOL_IUCV),
 #endif
 #if defined(SOL_CAIF)
-	{ SOL_CAIF,	"SOL_CAIF"	},
+	XLAT(SOL_CAIF),
 #endif
-	{ SOL_SOCKET,	"SOL_SOCKET"	},	/* Never used! */
+	XLAT(SOL_SOCKET),	/* Never used! */
 	/* The SOL_* array should remain not NULL-terminated. */
 };
 /*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
      falls into "protocols" array below!!!!   This is intended!!! ***/
 static const struct xlat protocols[] = {
-	{ IPPROTO_IP,	"IPPROTO_IP"	},
-	{ IPPROTO_ICMP,	"IPPROTO_ICMP"	},
-	{ IPPROTO_TCP,	"IPPROTO_TCP"	},
-	{ IPPROTO_UDP,	"IPPROTO_UDP"	},
+	XLAT(IPPROTO_IP),
+	XLAT(IPPROTO_ICMP),
+	XLAT(IPPROTO_TCP),
+	XLAT(IPPROTO_UDP),
 #ifdef IPPROTO_IGMP
-	{ IPPROTO_IGMP,	"IPPROTO_IGMP"	},
+	XLAT(IPPROTO_IGMP),
 #endif
 #ifdef IPPROTO_GGP
-	{ IPPROTO_GGP,	"IPPROTO_GGP"	},
+	XLAT(IPPROTO_GGP),
 #endif
 #ifdef IPPROTO_IPIP
-	{ IPPROTO_IPIP,	"IPPROTO_IPIP"	},
+	XLAT(IPPROTO_IPIP),
 #endif
 #ifdef IPPROTO_EGP
-	{ IPPROTO_EGP,	"IPPROTO_EGP"	},
+	XLAT(IPPROTO_EGP),
 #endif
 #ifdef IPPROTO_PUP
-	{ IPPROTO_PUP,	"IPPROTO_PUP"	},
+	XLAT(IPPROTO_PUP),
 #endif
 #ifdef IPPROTO_IDP
-	{ IPPROTO_IDP,	"IPPROTO_IDP"	},
+	XLAT(IPPROTO_IDP),
 #endif
 #ifdef IPPROTO_TP
-	{ IPPROTO_TP,	"IPPROTO_TP"	},
+	XLAT(IPPROTO_TP),
 #endif
 #ifdef IPPROTO_DCCP
-	{ IPPROTO_DCCP,	"IPPROTO_DCCP"	},
+	XLAT(IPPROTO_DCCP),
 #endif
 #ifdef IPPROTO_IPV6
-	{ IPPROTO_IPV6,	"IPPROTO_IPV6"	},
+	XLAT(IPPROTO_IPV6),
 #endif
 #ifdef IPPROTO_ROUTING
-	{ IPPROTO_ROUTING, "IPPROTO_ROUTING" },
+	XLAT(IPPROTO_ROUTING),
 #endif
 #ifdef IPPROTO_FRAGMENT
-	{ IPPROTO_FRAGMENT, "IPPROTO_FRAGMENT" },
+	XLAT(IPPROTO_FRAGMENT),
 #endif
 #ifdef IPPROTO_RSVP
-	{ IPPROTO_RSVP,	"IPPROTO_RSVP"	},
+	XLAT(IPPROTO_RSVP),
 #endif
 #ifdef IPPROTO_GRE
-	{ IPPROTO_GRE,	"IPPROTO_GRE"	},
+	XLAT(IPPROTO_GRE),
 #endif
 #ifdef IPPROTO_ESP
-	{ IPPROTO_ESP,	"IPPROTO_ESP"	},
+	XLAT(IPPROTO_ESP),
 #endif
 #ifdef IPPROTO_AH
-	{ IPPROTO_AH,	"IPPROTO_AH"	},
+	XLAT(IPPROTO_AH),
 #endif
 #ifdef IPPROTO_ICMPV6
-	{ IPPROTO_ICMPV6, "IPPROTO_ICMPV6" },
+	XLAT(IPPROTO_ICMPV6),
 #endif
 #ifdef IPPROTO_NONE
-	{ IPPROTO_NONE,	"IPPROTO_NONE"	},
+	XLAT(IPPROTO_NONE),
 #endif
 #ifdef IPPROTO_DSTOPTS
-	{ IPPROTO_DSTOPTS, "IPPROTO_DSTOPTS" },
+	XLAT(IPPROTO_DSTOPTS),
 #endif
 #ifdef IPPROTO_HELLO
-	{ IPPROTO_HELLO, "IPPROTO_HELLO" },
+	XLAT(IPPROTO_HELLO),
 #endif
 #ifdef IPPROTO_ND
-	{ IPPROTO_ND,	"IPPROTO_ND"	},
+	XLAT(IPPROTO_ND),
 #endif
 #ifdef IPPROTO_MTP
-	{ IPPROTO_MTP,	"IPPROTO_MTP"	},
+	XLAT(IPPROTO_MTP),
 #endif
 #ifdef IPPROTO_ENCAP
-	{ IPPROTO_ENCAP, "IPPROTO_ENCAP" },
+	XLAT(IPPROTO_ENCAP),
 #endif
 #ifdef IPPROTO_PIM
-	{ IPPROTO_PIM,	"IPPROTO_PIM"	},
+	XLAT(IPPROTO_PIM),
 #endif
 #ifdef IPPROTO_COMP
-	{ IPPROTO_COMP,	"IPPROTO_COMP"	},
+	XLAT(IPPROTO_COMP),
 #endif
 #ifdef IPPROTO_SCTP
-	{ IPPROTO_SCTP,	"IPPROTO_SCTP"	},
+	XLAT(IPPROTO_SCTP),
 #endif
 #ifdef IPPROTO_UDPLITE
-	{ IPPROTO_UDPLITE, "IPPROTO_UDPLITE" },
+	XLAT(IPPROTO_UDPLITE),
 #endif
 #ifdef IPPROTO_RAW
-	{ IPPROTO_RAW,	"IPPROTO_RAW"	},
+	XLAT(IPPROTO_RAW),
 #endif
 #ifdef IPPROTO_MAX
-	{ IPPROTO_MAX,	"IPPROTO_MAX"	},
+	XLAT(IPPROTO_MAX),
 #endif
 	{ 0,		NULL		},
 };
 static const struct xlat msg_flags[] = {
-	{ MSG_OOB,		"MSG_OOB"		},
+	XLAT(MSG_OOB),
 #ifdef MSG_PEEK
-	{ MSG_PEEK,		"MSG_PEEK"		},
+	XLAT(MSG_PEEK),
 #endif
 #ifdef MSG_DONTROUTE
-	{ MSG_DONTROUTE,	"MSG_DONTROUTE"		},
+	XLAT(MSG_DONTROUTE),
 #endif
 #ifdef MSG_CTRUNC
-	{ MSG_CTRUNC,		"MSG_CTRUNC"		},
+	XLAT(MSG_CTRUNC),
 #endif
 #ifdef MSG_PROBE
-	{ MSG_PROBE,		"MSG_PROBE"		},
+	XLAT(MSG_PROBE),
 #endif
 #ifdef MSG_TRUNC
-	{ MSG_TRUNC,		"MSG_TRUNC"		},
+	XLAT(MSG_TRUNC),
 #endif
 #ifdef MSG_DONTWAIT
-	{ MSG_DONTWAIT,		"MSG_DONTWAIT"		},
+	XLAT(MSG_DONTWAIT),
 #endif
 #ifdef MSG_EOR
-	{ MSG_EOR,		"MSG_EOR"		},
+	XLAT(MSG_EOR),
 #endif
 #ifdef MSG_WAITALL
-	{ MSG_WAITALL,		"MSG_WAITALL"		},
+	XLAT(MSG_WAITALL),
 #endif
 #ifdef MSG_FIN
-	{ MSG_FIN,		"MSG_FIN"		},
+	XLAT(MSG_FIN),
 #endif
 #ifdef MSG_SYN
-	{ MSG_SYN,		"MSG_SYN"		},
+	XLAT(MSG_SYN),
 #endif
 #ifdef MSG_CONFIRM
-	{ MSG_CONFIRM,		"MSG_CONFIRM"		},
+	XLAT(MSG_CONFIRM),
 #endif
 #ifdef MSG_RST
-	{ MSG_RST,		"MSG_RST"		},
+	XLAT(MSG_RST),
 #endif
 #ifdef MSG_ERRQUEUE
-	{ MSG_ERRQUEUE,		"MSG_ERRQUEUE"		},
+	XLAT(MSG_ERRQUEUE),
 #endif
 #ifdef MSG_NOSIGNAL
-	{ MSG_NOSIGNAL,		"MSG_NOSIGNAL"		},
+	XLAT(MSG_NOSIGNAL),
 #endif
 #ifdef MSG_MORE
-	{ MSG_MORE,		"MSG_MORE"		},
+	XLAT(MSG_MORE),
 #endif
 #ifdef MSG_WAITFORONE
-	{ MSG_WAITFORONE,	"MSG_WAITFORONE"	},
+	XLAT(MSG_WAITFORONE),
 #endif
 #ifdef MSG_EOF
-	{ MSG_EOF,		"MSG_EOF"		},
+	XLAT(MSG_EOF),
 #endif
 #ifdef MSG_FASTOPEN
-	{ MSG_FASTOPEN,		"MSG_FASTOPEN"		},
+	XLAT(MSG_FASTOPEN),
 #endif
 #ifdef MSG_CMSG_CLOEXEC
-	{ MSG_CMSG_CLOEXEC,	"MSG_CMSG_CLOEXEC"	},
+	XLAT(MSG_CMSG_CLOEXEC),
 #endif
 	{ 0,			NULL			},
 };
 
 static const struct xlat sockoptions[] = {
 #ifdef SO_ACCEPTCONN
-	{ SO_ACCEPTCONN,	"SO_ACCEPTCONN"	},
+	XLAT(SO_ACCEPTCONN),
 #endif
 #ifdef SO_ALLRAW
-	{ SO_ALLRAW,	"SO_ALLRAW"	},
+	XLAT(SO_ALLRAW),
 #endif
 #ifdef SO_ATTACH_FILTER
-	{ SO_ATTACH_FILTER,	"SO_ATTACH_FILTER"	},
+	XLAT(SO_ATTACH_FILTER),
 #endif
 #ifdef SO_BINDTODEVICE
-	{ SO_BINDTODEVICE,	"SO_BINDTODEVICE"	},
+	XLAT(SO_BINDTODEVICE),
 #endif
 #ifdef SO_BROADCAST
-	{ SO_BROADCAST,	"SO_BROADCAST"	},
+	XLAT(SO_BROADCAST),
 #endif
 #ifdef SO_BSDCOMPAT
-	{ SO_BSDCOMPAT,	"SO_BSDCOMPAT"	},
+	XLAT(SO_BSDCOMPAT),
 #endif
 #ifdef SO_DEBUG
-	{ SO_DEBUG,	"SO_DEBUG"	},
+	XLAT(SO_DEBUG),
 #endif
 #ifdef SO_DETACH_FILTER
-	{ SO_DETACH_FILTER,	"SO_DETACH_FILTER"	},
+	XLAT(SO_DETACH_FILTER),
 #endif
 #ifdef SO_DONTROUTE
-	{ SO_DONTROUTE,	"SO_DONTROUTE"	},
+	XLAT(SO_DONTROUTE),
 #endif
 #ifdef SO_ERROR
-	{ SO_ERROR,	"SO_ERROR"	},
+	XLAT(SO_ERROR),
 #endif
 #ifdef SO_ICS
-	{ SO_ICS,	"SO_ICS"	},
+	XLAT(SO_ICS),
 #endif
 #ifdef SO_IMASOCKET
-	{ SO_IMASOCKET,	"SO_IMASOCKET"	},
+	XLAT(SO_IMASOCKET),
 #endif
 #ifdef SO_KEEPALIVE
-	{ SO_KEEPALIVE,	"SO_KEEPALIVE"	},
+	XLAT(SO_KEEPALIVE),
 #endif
 #ifdef SO_LINGER
-	{ SO_LINGER,	"SO_LINGER"	},
+	XLAT(SO_LINGER),
 #endif
 #ifdef SO_LISTENING
-	{ SO_LISTENING,	"SO_LISTENING"	},
+	XLAT(SO_LISTENING),
 #endif
 #ifdef SO_MGMT
-	{ SO_MGMT,	"SO_MGMT"	},
+	XLAT(SO_MGMT),
 #endif
 #ifdef SO_NO_CHECK
-	{ SO_NO_CHECK,	"SO_NO_CHECK"	},
+	XLAT(SO_NO_CHECK),
 #endif
 #ifdef SO_OOBINLINE
-	{ SO_OOBINLINE,	"SO_OOBINLINE"	},
+	XLAT(SO_OOBINLINE),
 #endif
 #ifdef SO_ORDREL
-	{ SO_ORDREL,	"SO_ORDREL"	},
+	XLAT(SO_ORDREL),
 #endif
 #ifdef SO_PARALLELSVR
-	{ SO_PARALLELSVR,	"SO_PARALLELSVR"	},
+	XLAT(SO_PARALLELSVR),
 #endif
 #ifdef SO_PASSCRED
-	{ SO_PASSCRED,	"SO_PASSCRED"	},
+	XLAT(SO_PASSCRED),
 #endif
 #ifdef SO_PEERCRED
-	{ SO_PEERCRED,	"SO_PEERCRED"	},
+	XLAT(SO_PEERCRED),
 #endif
 #ifdef SO_PEERNAME
-	{ SO_PEERNAME,	"SO_PEERNAME"	},
+	XLAT(SO_PEERNAME),
 #endif
 #ifdef SO_PEERSEC
-	{ SO_PEERSEC,	"SO_PEERSEC"	},
+	XLAT(SO_PEERSEC),
 #endif
 #ifdef SO_PRIORITY
-	{ SO_PRIORITY,	"SO_PRIORITY"	},
+	XLAT(SO_PRIORITY),
 #endif
 #ifdef SO_PROTOTYPE
-	{ SO_PROTOTYPE,	"SO_PROTOTYPE"	},
+	XLAT(SO_PROTOTYPE),
 #endif
 #ifdef SO_RCVBUF
-	{ SO_RCVBUF,	"SO_RCVBUF"	},
+	XLAT(SO_RCVBUF),
 #endif
 #ifdef SO_RCVLOWAT
-	{ SO_RCVLOWAT,	"SO_RCVLOWAT"	},
+	XLAT(SO_RCVLOWAT),
 #endif
 #ifdef SO_RCVTIMEO
-	{ SO_RCVTIMEO,	"SO_RCVTIMEO"	},
+	XLAT(SO_RCVTIMEO),
 #endif
 #ifdef SO_RDWR
-	{ SO_RDWR,	"SO_RDWR"	},
+	XLAT(SO_RDWR),
 #endif
 #ifdef SO_REUSEADDR
-	{ SO_REUSEADDR,	"SO_REUSEADDR"	},
+	XLAT(SO_REUSEADDR),
 #endif
 #ifdef SO_REUSEPORT
-	{ SO_REUSEPORT,	"SO_REUSEPORT"	},
+	XLAT(SO_REUSEPORT),
 #endif
 #ifdef SO_SECURITY_AUTHENTICATION
-	{ SO_SECURITY_AUTHENTICATION,"SO_SECURITY_AUTHENTICATION"},
+	XLAT(SO_SECURITY_AUTHENTICATION),
 #endif
 #ifdef SO_SECURITY_ENCRYPTION_NETWORK
-	{ SO_SECURITY_ENCRYPTION_NETWORK,"SO_SECURITY_ENCRYPTION_NETWORK"},
+	XLAT(SO_SECURITY_ENCRYPTION_NETWORK),
 #endif
 #ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
-	{ SO_SECURITY_ENCRYPTION_TRANSPORT,"SO_SECURITY_ENCRYPTION_TRANSPORT"},
+	XLAT(SO_SECURITY_ENCRYPTION_TRANSPORT),
 #endif
 #ifdef SO_SEMA
-	{ SO_SEMA,	"SO_SEMA"	},
+	XLAT(SO_SEMA),
 #endif
 #ifdef SO_SNDBUF
-	{ SO_SNDBUF,	"SO_SNDBUF"	},
+	XLAT(SO_SNDBUF),
 #endif
 #ifdef SO_SNDLOWAT
-	{ SO_SNDLOWAT,	"SO_SNDLOWAT"	},
+	XLAT(SO_SNDLOWAT),
 #endif
 #ifdef SO_SNDTIMEO
-	{ SO_SNDTIMEO,	"SO_SNDTIMEO"	},
+	XLAT(SO_SNDTIMEO),
 #endif
 #ifdef SO_TIMESTAMP
-	{ SO_TIMESTAMP,	"SO_TIMESTAMP"	},
+	XLAT(SO_TIMESTAMP),
 #endif
 #ifdef SO_TYPE
-	{ SO_TYPE,	"SO_TYPE"	},
+	XLAT(SO_TYPE),
 #endif
 #ifdef SO_USELOOPBACK
-	{ SO_USELOOPBACK,	"SO_USELOOPBACK"	},
+	XLAT(SO_USELOOPBACK),
 #endif
 	{ 0,		NULL		},
 };
@@ -770,145 +770,145 @@ static const struct xlat sockoptions[] = {
 #ifdef SOL_IP
 static const struct xlat sockipoptions[] = {
 #ifdef IP_TOS
-	{ IP_TOS,		"IP_TOS"		},
+	XLAT(IP_TOS),
 #endif
 #ifdef IP_TTL
-	{ IP_TTL,		"IP_TTL"		},
+	XLAT(IP_TTL),
 #endif
 #ifdef IP_HDRINCL
-	{ IP_HDRINCL,		"IP_HDRINCL"		},
+	XLAT(IP_HDRINCL),
 #endif
 #ifdef IP_OPTIONS
-	{ IP_OPTIONS,		"IP_OPTIONS"		},
+	XLAT(IP_OPTIONS),
 #endif
 #ifdef IP_ROUTER_ALERT
-	{ IP_ROUTER_ALERT,	"IP_ROUTER_ALERT"	},
+	XLAT(IP_ROUTER_ALERT),
 #endif
 #ifdef IP_RECVOPTIONS
-	{ IP_RECVOPTIONS,	"IP_RECVOPTIONS"	},
+	XLAT(IP_RECVOPTIONS),
 #endif
 #ifdef IP_RECVOPTS
-	{ IP_RECVOPTS,		"IP_RECVOPTS"		},
+	XLAT(IP_RECVOPTS),
 #endif
 #ifdef IP_RECVRETOPTS
-	{ IP_RECVRETOPTS,	"IP_RECVRETOPTS"	},
+	XLAT(IP_RECVRETOPTS),
 #endif
 #ifdef IP_RECVDSTADDR
-	{ IP_RECVDSTADDR,	"IP_RECVDSTADDR"	},
+	XLAT(IP_RECVDSTADDR),
 #endif
 #ifdef IP_RETOPTS
-	{ IP_RETOPTS,		"IP_RETOPTS"		},
+	XLAT(IP_RETOPTS),
 #endif
 #ifdef IP_PKTINFO
-	{ IP_PKTINFO,		"IP_PKTINFO"		},
+	XLAT(IP_PKTINFO),
 #endif
 #ifdef IP_PKTOPTIONS
-	{ IP_PKTOPTIONS,	"IP_PKTOPTIONS"		},
+	XLAT(IP_PKTOPTIONS),
 #endif
 #ifdef IP_MTU_DISCOVER
-	{ IP_MTU_DISCOVER,	"IP_MTU_DISCOVER"	},
+	XLAT(IP_MTU_DISCOVER),
 #endif
 #ifdef IP_RECVERR
-	{ IP_RECVERR,		"IP_RECVERR"		},
+	XLAT(IP_RECVERR),
 #endif
 #ifdef IP_RECVTTL
-	{ IP_RECVTTL,		"IP_RECVTTL"		},
+	XLAT(IP_RECVTTL),
 #endif
 #ifdef IP_RECVTOS
-	{ IP_RECVTOS,		"IP_RECVTOS"		},
+	XLAT(IP_RECVTOS),
 #endif
 #ifdef IP_MTU
-	{ IP_MTU,		"IP_MTU"		},
+	XLAT(IP_MTU),
 #endif
 #ifdef IP_MULTICAST_IF
-	{ IP_MULTICAST_IF,	"IP_MULTICAST_IF"	},
+	XLAT(IP_MULTICAST_IF),
 #endif
 #ifdef IP_MULTICAST_TTL
-	{ IP_MULTICAST_TTL,	"IP_MULTICAST_TTL"	},
+	XLAT(IP_MULTICAST_TTL),
 #endif
 #ifdef IP_MULTICAST_LOOP
-	{ IP_MULTICAST_LOOP,	"IP_MULTICAST_LOOP"	},
+	XLAT(IP_MULTICAST_LOOP),
 #endif
 #ifdef IP_ADD_MEMBERSHIP
-	{ IP_ADD_MEMBERSHIP,	"IP_ADD_MEMBERSHIP"	},
+	XLAT(IP_ADD_MEMBERSHIP),
 #endif
 #ifdef IP_DROP_MEMBERSHIP
-	{ IP_DROP_MEMBERSHIP,	"IP_DROP_MEMBERSHIP"	},
+	XLAT(IP_DROP_MEMBERSHIP),
 #endif
 #ifdef IP_BROADCAST_IF
-	{ IP_BROADCAST_IF,	"IP_BROADCAST_IF"	},
+	XLAT(IP_BROADCAST_IF),
 #endif
 #ifdef IP_RECVIFINDEX
-	{ IP_RECVIFINDEX,	"IP_RECVIFINDEX"	},
+	XLAT(IP_RECVIFINDEX),
 #endif
 #ifdef IP_MSFILTER
-	{ IP_MSFILTER,		"IP_MSFILTER"		},
+	XLAT(IP_MSFILTER),
 #endif
 #ifdef MCAST_MSFILTER
-	{ MCAST_MSFILTER,	"MCAST_MSFILTER"	},
+	XLAT(MCAST_MSFILTER),
 #endif
 #ifdef IP_FREEBIND
-	{ IP_FREEBIND,		"IP_FREEBIND"		},
+	XLAT(IP_FREEBIND),
 #endif
 #ifdef IP_IPSEC_POLICY
-	{ IP_IPSEC_POLICY,	"IP_IPSEC_POLICY"	},
+	XLAT(IP_IPSEC_POLICY),
 #endif
 #ifdef IP_XFRM_POLICY
-	{ IP_XFRM_POLICY,	"IP_XFRM_POLICY"	},
+	XLAT(IP_XFRM_POLICY),
 #endif
 #ifdef IP_PASSSEC
-	{ IP_PASSSEC,		"IP_PASSSEC"		},
+	XLAT(IP_PASSSEC),
 #endif
 #ifdef IP_TRANSPARENT
-	{ IP_TRANSPARENT,	"IP_TRANSPARENT"	},
+	XLAT(IP_TRANSPARENT),
 #endif
 #ifdef IP_ORIGDSTADDR
-	{ IP_ORIGDSTADDR,	"IP_ORIGDSTADDR"	},
+	XLAT(IP_ORIGDSTADDR),
 #endif
 #ifdef IP_RECVORIGDSTADDR
-	{ IP_RECVORIGDSTADDR,	"IP_RECVORIGDSTADDR"	},
+	XLAT(IP_RECVORIGDSTADDR),
 #endif
 #ifdef IP_MINTTL
-	{ IP_MINTTL,		"IP_MINTTL"		},
+	XLAT(IP_MINTTL),
 #endif
 #ifdef IP_NODEFRAG
-	{ IP_NODEFRAG,		"IP_NODEFRAG"		},
+	XLAT(IP_NODEFRAG),
 #endif
 #ifdef IP_UNBLOCK_SOURCE
-	{ IP_UNBLOCK_SOURCE,	"IP_UNBLOCK_SOURCE"	},
+	XLAT(IP_UNBLOCK_SOURCE),
 #endif
 #ifdef IP_BLOCK_SOURCE
-	{ IP_BLOCK_SOURCE,	"IP_BLOCK_SOURCE"	},
+	XLAT(IP_BLOCK_SOURCE),
 #endif
 #ifdef IP_ADD_SOURCE_MEMBERSHIP
-	{ IP_ADD_SOURCE_MEMBERSHIP, "IP_ADD_SOURCE_MEMBERSHIP"	},
+	XLAT(IP_ADD_SOURCE_MEMBERSHIP),
 #endif
 #ifdef IP_DROP_SOURCE_MEMBERSHIP
-	{ IP_DROP_SOURCE_MEMBERSHIP, "IP_DROP_SOURCE_MEMBERSHIP"	},
+	XLAT(IP_DROP_SOURCE_MEMBERSHIP),
 #endif
 #ifdef MCAST_JOIN_GROUP
-	{ MCAST_JOIN_GROUP,	"MCAST_JOIN_GROUP"	},
+	XLAT(MCAST_JOIN_GROUP),
 #endif
 #ifdef MCAST_BLOCK_SOURCE
-	{ MCAST_BLOCK_SOURCE,	"MCAST_BLOCK_SOURCE"	},
+	XLAT(MCAST_BLOCK_SOURCE),
 #endif
 #ifdef MCAST_UNBLOCK_SOURCE
-	{ MCAST_UNBLOCK_SOURCE,	"MCAST_UNBLOCK_SOURCE"	},
+	XLAT(MCAST_UNBLOCK_SOURCE),
 #endif
 #ifdef MCAST_LEAVE_GROUP
-	{ MCAST_LEAVE_GROUP,	"MCAST_LEAVE_GROUP"	},
+	XLAT(MCAST_LEAVE_GROUP),
 #endif
 #ifdef MCAST_JOIN_SOURCE_GROUP
-	{ MCAST_JOIN_SOURCE_GROUP, "MCAST_JOIN_SOURCE_GROUP"	},
+	XLAT(MCAST_JOIN_SOURCE_GROUP),
 #endif
 #ifdef MCAST_LEAVE_SOURCE_GROUP
-	{ MCAST_LEAVE_SOURCE_GROUP, "MCAST_LEAVE_SOURCE_GROUP"	},
+	XLAT(MCAST_LEAVE_SOURCE_GROUP),
 #endif
 #ifdef IP_MULTICAST_ALL
-	{ IP_MULTICAST_ALL,	"IP_MULTICAST_ALL"	},
+	XLAT(IP_MULTICAST_ALL),
 #endif
 #ifdef IP_UNICAST_IF
-	{ IP_UNICAST_IF,	"IP_UNICAST_IF"		},
+	XLAT(IP_UNICAST_IF),
 #endif
 	{ 0,			NULL			},
 };
@@ -917,67 +917,67 @@ static const struct xlat sockipoptions[] = {
 #ifdef SOL_IPV6
 static const struct xlat sockipv6options[] = {
 #ifdef IPV6_ADDRFORM
-	{ IPV6_ADDRFORM,	"IPV6_ADDRFORM"		},
+	XLAT(IPV6_ADDRFORM),
 #endif
 #ifdef MCAST_FILTER
-	{ MCAST_FILTER,		"MCAST_FILTER"		},
+	XLAT(MCAST_FILTER),
 #endif
 #ifdef IPV6_PKTOPTIONS
-	{ IPV6_PKTOPTIONS,	"IPV6_PKTOPTIONS"	},
+	XLAT(IPV6_PKTOPTIONS),
 #endif
 #ifdef IPV6_MTU
-	{ IPV6_MTU,		"IPV6_MTU"		},
+	XLAT(IPV6_MTU),
 #endif
 #ifdef IPV6_V6ONLY
-	{ IPV6_V6ONLY,		"IPV6_V6ONLY"		},
+	XLAT(IPV6_V6ONLY),
 #endif
 #ifdef IPV6_PKTINFO
-	{ IPV6_PKTINFO,		"IPV6_PKTINFO"		},
+	XLAT(IPV6_PKTINFO),
 #endif
 #ifdef IPV6_HOPLIMIT
-	{ IPV6_HOPLIMIT,	"IPV6_HOPLIMIT"		},
+	XLAT(IPV6_HOPLIMIT),
 #endif
 #ifdef IPV6_RTHDR
-	{ IPV6_RTHDR,		"IPV6_RTHDR"		},
+	XLAT(IPV6_RTHDR),
 #endif
 #ifdef IPV6_HOPOPTS
-	{ IPV6_HOPOPTS,		"IPV6_HOPOPTS"		},
+	XLAT(IPV6_HOPOPTS),
 #endif
 #ifdef IPV6_DSTOPTS
-	{ IPV6_DSTOPTS,		"IPV6_DSTOPTS"		},
+	XLAT(IPV6_DSTOPTS),
 #endif
 #ifdef IPV6_FLOWINFO
-	{ IPV6_FLOWINFO,	"IPV6_FLOWINFO"		},
+	XLAT(IPV6_FLOWINFO),
 #endif
 #ifdef IPV6_UNICAST_HOPS
-	{ IPV6_UNICAST_HOPS,	"IPV6_UNICAST_HOPS"	},
+	XLAT(IPV6_UNICAST_HOPS),
 #endif
 #ifdef IPV6_MULTICAST_HOPS
-	{ IPV6_MULTICAST_HOPS,	"IPV6_MULTICAST_HOPS"	},
+	XLAT(IPV6_MULTICAST_HOPS),
 #endif
 #ifdef IPV6_MULTICAST_LOOP
-	{ IPV6_MULTICAST_LOOP,	"IPV6_MULTICAST_LOOP"	},
+	XLAT(IPV6_MULTICAST_LOOP),
 #endif
 #ifdef IPV6_MULTICAST_IF
-	{ IPV6_MULTICAST_IF,	"IPV6_MULTICAST_IF"	},
+	XLAT(IPV6_MULTICAST_IF),
 #endif
 #ifdef IPV6_MTU_DISCOVER
-	{ IPV6_MTU_DISCOVER,	"IPV6_MTU_DISCOVER"	},
+	XLAT(IPV6_MTU_DISCOVER),
 #endif
 #ifdef IPV6_RECVERR
-	{ IPV6_RECVERR,		"IPV6_RECVERR"		},
+	XLAT(IPV6_RECVERR),
 #endif
 #ifdef IPV6_FLOWINFO_SEND
-	{ IPV6_FLOWINFO_SEND,	"IPV6_FLOWINFO_SEND"	},
+	XLAT(IPV6_FLOWINFO_SEND),
 #endif
 #ifdef IPV6_ADD_MEMBERSHIP
-	{ IPV6_ADD_MEMBERSHIP,	"IPV6_ADD_MEMBERSHIP"	},
+	XLAT(IPV6_ADD_MEMBERSHIP),
 #endif
 #ifdef IPV6_DROP_MEMBERSHIP
-	{ IPV6_DROP_MEMBERSHIP,	"IPV6_DROP_MEMBERSHIP"	},
+	XLAT(IPV6_DROP_MEMBERSHIP),
 #endif
 #ifdef IPV6_ROUTER_ALERT
-	{ IPV6_ROUTER_ALERT,	"IPV6_ROUTER_ALERT"	},
+	XLAT(IPV6_ROUTER_ALERT),
 #endif
 	{ 0,			NULL			},
 };
@@ -985,7 +985,7 @@ static const struct xlat sockipv6options[] = {
 
 #ifdef SOL_IPX
 static const struct xlat sockipxoptions[] = {
-	{ IPX_TYPE,	"IPX_TYPE"	},
+	XLAT(IPX_TYPE),
 	{ 0,		NULL		},
 };
 #endif /* SOL_IPX */
@@ -993,7 +993,7 @@ static const struct xlat sockipxoptions[] = {
 #ifdef SOL_RAW
 static const struct xlat sockrawoptions[] = {
 #if defined(ICMP_FILTER)
-	{ ICMP_FILTER,		"ICMP_FILTER"	},
+	XLAT(ICMP_FILTER),
 #endif
 	{ 0,			NULL		},
 };
@@ -1002,43 +1002,43 @@ static const struct xlat sockrawoptions[] = {
 #ifdef SOL_PACKET
 static const struct xlat sockpacketoptions[] = {
 #ifdef PACKET_ADD_MEMBERSHIP
-	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
+	XLAT(PACKET_ADD_MEMBERSHIP),
 #endif
 #ifdef PACKET_DROP_MEMBERSHIP
-	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
+	XLAT(PACKET_DROP_MEMBERSHIP),
 #endif
 #if defined(PACKET_RECV_OUTPUT)
-	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
+	XLAT(PACKET_RECV_OUTPUT),
 #endif
 #if defined(PACKET_RX_RING)
-	{ PACKET_RX_RING,		"PACKET_RX_RING"	},
+	XLAT(PACKET_RX_RING),
 #endif
 #if defined(PACKET_STATISTICS)
-	{ PACKET_STATISTICS,		"PACKET_STATISTICS"	},
+	XLAT(PACKET_STATISTICS),
 #endif
 #if defined(PACKET_COPY_THRESH)
-	{ PACKET_COPY_THRESH,		"PACKET_COPY_THRESH"	},
+	XLAT(PACKET_COPY_THRESH),
 #endif
 #if defined(PACKET_AUXDATA)
-	{ PACKET_AUXDATA,		"PACKET_AUXDATA"	},
+	XLAT(PACKET_AUXDATA),
 #endif
 #if defined(PACKET_ORIGDEV)
-	{ PACKET_ORIGDEV,		"PACKET_ORIGDEV"	},
+	XLAT(PACKET_ORIGDEV),
 #endif
 #if defined(PACKET_VERSION)
-	{ PACKET_VERSION,		"PACKET_VERSION"	},
+	XLAT(PACKET_VERSION),
 #endif
 #if defined(PACKET_HDRLEN)
-	{ PACKET_HDRLEN,		"PACKET_HDRLEN"	},
+	XLAT(PACKET_HDRLEN),
 #endif
 #if defined(PACKET_RESERVE)
-	{ PACKET_RESERVE,		"PACKET_RESERVE"	},
+	XLAT(PACKET_RESERVE),
 #endif
 #if defined(PACKET_TX_RING)
-	{ PACKET_TX_RING,		"PACKET_TX_RING"	},
+	XLAT(PACKET_TX_RING),
 #endif
 #if defined(PACKET_LOSS)
-	{ PACKET_LOSS,			"PACKET_LOSS"	},
+	XLAT(PACKET_LOSS),
 #endif
 	{ 0,				NULL			},
 };
@@ -1047,123 +1047,123 @@ static const struct xlat sockpacketoptions[] = {
 #ifdef SOL_SCTP
 static const struct xlat socksctpoptions[] = {
 #if defined(SCTP_RTOINFO)
-	{ SCTP_RTOINFO,			"SCTP_RTOINFO"	},
+	XLAT(SCTP_RTOINFO),
 #endif
 #if defined(SCTP_ASSOCINFO)
-	{ SCTP_ASSOCINFO,		"SCTP_ASSOCINFO"},
+	XLAT(SCTP_ASSOCINFO),
 #endif
 #if defined(SCTP_INITMSG)
-	{ SCTP_INITMSG,			"SCTP_INITMSG"	},
+	XLAT(SCTP_INITMSG),
 #endif
 #if defined(SCTP_NODELAY)
-	{ SCTP_NODELAY,			"SCTP_NODELAY"	},
+	XLAT(SCTP_NODELAY),
 #endif
 #if defined(SCTP_AUTOCLOSE)
-	{ SCTP_AUTOCLOSE,		"SCTP_AUTOCLOSE"},
+	XLAT(SCTP_AUTOCLOSE),
 #endif
 #if defined(SCTP_SET_PEER_PRIMARY_ADDR)
-	{ SCTP_SET_PEER_PRIMARY_ADDR,	"SCTP_SET_PEER_PRIMARY_ADDR"},
+	XLAT(SCTP_SET_PEER_PRIMARY_ADDR),
 #endif
 #if defined(SCTP_PRIMARY_ADDR)
-	{ SCTP_PRIMARY_ADDR,		"SCTP_PRIMARY_ADDR"	},
+	XLAT(SCTP_PRIMARY_ADDR),
 #endif
 #if defined(SCTP_ADAPTATION_LAYER)
-	{ SCTP_ADAPTATION_LAYER,	"SCTP_ADAPTATION_LAYER"	},
+	XLAT(SCTP_ADAPTATION_LAYER),
 #endif
 #if defined(SCTP_DISABLE_FRAGMENTS)
-	{ SCTP_DISABLE_FRAGMENTS,	"SCTP_DISABLE_FRAGMENTS"},
+	XLAT(SCTP_DISABLE_FRAGMENTS),
 #endif
 #if defined(SCTP_PEER_ADDR_PARAMS)
-	{ SCTP_PEER_ADDR_PARAMS,	"SCTP_PEER_ADDR_PARAMS"	},
+	XLAT(SCTP_PEER_ADDR_PARAMS),
 #endif
 #if defined(SCTP_DEFAULT_SEND_PARAM)
-	{ SCTP_DEFAULT_SEND_PARAM,	"SCTP_DEFAULT_SEND_PARAM"},
+	XLAT(SCTP_DEFAULT_SEND_PARAM),
 #endif
 #if defined(SCTP_EVENTS)
-	{ SCTP_EVENTS,			"SCTP_EVENTS"		},
+	XLAT(SCTP_EVENTS),
 #endif
 #if defined(SCTP_I_WANT_MAPPED_V4_ADDR)
-	{ SCTP_I_WANT_MAPPED_V4_ADDR,	"SCTP_I_WANT_MAPPED_V4_ADDR"},
+	XLAT(SCTP_I_WANT_MAPPED_V4_ADDR),
 #endif
 #if defined(SCTP_MAXSEG)
-	{ SCTP_MAXSEG,			"SCTP_MAXSEG"		},
+	XLAT(SCTP_MAXSEG),
 #endif
 #if defined(SCTP_STATUS)
-	{ SCTP_STATUS,			"SCTP_STATUS"		},
+	XLAT(SCTP_STATUS),
 #endif
 #if defined(SCTP_GET_PEER_ADDR_INFO)
-	{ SCTP_GET_PEER_ADDR_INFO,	"SCTP_GET_PEER_ADDR_INFO"},
+	XLAT(SCTP_GET_PEER_ADDR_INFO),
 #endif
 #if defined(SCTP_DELAYED_ACK)
-	{ SCTP_DELAYED_ACK,		"SCTP_DELAYED_ACK"	},
+	XLAT(SCTP_DELAYED_ACK),
 #endif
 #if defined(SCTP_CONTEXT)
-	{ SCTP_CONTEXT,			"SCTP_CONTEXT"		},
+	XLAT(SCTP_CONTEXT),
 #endif
 #if defined(SCTP_FRAGMENT_INTERLEAVE)
-	{ SCTP_FRAGMENT_INTERLEAVE,	"SCTP_FRAGMENT_INTERLEAVE"},
+	XLAT(SCTP_FRAGMENT_INTERLEAVE),
 #endif
 #if defined(SCTP_PARTIAL_DELIVERY_POINT)
-	{ SCTP_PARTIAL_DELIVERY_POINT,	"SCTP_PARTIAL_DELIVERY_POINT"},
+	XLAT(SCTP_PARTIAL_DELIVERY_POINT),
 #endif
 #if defined(SCTP_MAX_BURST)
-	{ SCTP_MAX_BURST,		"SCTP_MAX_BURST"	},
+	XLAT(SCTP_MAX_BURST),
 #endif
 #if defined(SCTP_AUTH_CHUNK)
-	{ SCTP_AUTH_CHUNK,		"SCTP_AUTH_CHUNK"	},
+	XLAT(SCTP_AUTH_CHUNK),
 #endif
 #if defined(SCTP_HMAC_IDENT)
-	{ SCTP_HMAC_IDENT,		"SCTP_HMAC_IDENT"	},
+	XLAT(SCTP_HMAC_IDENT),
 #endif
 #if defined(SCTP_AUTH_KEY)
-	{ SCTP_AUTH_KEY,		"SCTP_AUTH_KEY"		},
+	XLAT(SCTP_AUTH_KEY),
 #endif
 #if defined(SCTP_AUTH_ACTIVE_KEY)
-	{ SCTP_AUTH_ACTIVE_KEY,		"SCTP_AUTH_ACTIVE_KEY"	},
+	XLAT(SCTP_AUTH_ACTIVE_KEY),
 #endif
 #if defined(SCTP_AUTH_DELETE_KEY)
-	{ SCTP_AUTH_DELETE_KEY,		"SCTP_AUTH_DELETE_KEY"	},
+	XLAT(SCTP_AUTH_DELETE_KEY),
 #endif
 #if defined(SCTP_PEER_AUTH_CHUNKS)
-	{ SCTP_PEER_AUTH_CHUNKS,	"SCTP_PEER_AUTH_CHUNKS"	},
+	XLAT(SCTP_PEER_AUTH_CHUNKS),
 #endif
 #if defined(SCTP_LOCAL_AUTH_CHUNKS)
-	{ SCTP_LOCAL_AUTH_CHUNKS,	"SCTP_LOCAL_AUTH_CHUNKS"},
+	XLAT(SCTP_LOCAL_AUTH_CHUNKS),
 #endif
 #if defined(SCTP_GET_ASSOC_NUMBER)
-	{ SCTP_GET_ASSOC_NUMBER,	"SCTP_GET_ASSOC_NUMBER"	},
+	XLAT(SCTP_GET_ASSOC_NUMBER),
 #endif
 
 	/* linux specific things */
 #if defined(SCTP_SOCKOPT_BINDX_ADD)
-	{ SCTP_SOCKOPT_BINDX_ADD,	"SCTP_SOCKOPT_BINDX_ADD"	},
+	XLAT(SCTP_SOCKOPT_BINDX_ADD),
 #endif
 #if defined(SCTP_SOCKOPT_BINDX_REM)
-	{ SCTP_SOCKOPT_BINDX_REM,	"SCTP_SOCKOPT_BINDX_REM"	},
+	XLAT(SCTP_SOCKOPT_BINDX_REM),
 #endif
 #if defined(SCTP_SOCKOPT_PEELOFF)
-	{ SCTP_SOCKOPT_PEELOFF,		"SCTP_SOCKOPT_PEELOFF"		},
+	XLAT(SCTP_SOCKOPT_PEELOFF),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS_NUM_OLD)
-	{ SCTP_GET_PEER_ADDRS_NUM_OLD,	"SCTP_GET_PEER_ADDRS_NUM_OLD"	},
+	XLAT(SCTP_GET_PEER_ADDRS_NUM_OLD),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS_OLD)
-	{ SCTP_GET_PEER_ADDRS_OLD,	"SCTP_GET_PEER_ADDRS_OLD"	},
+	XLAT(SCTP_GET_PEER_ADDRS_OLD),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD)
-	{ SCTP_GET_LOCAL_ADDRS_NUM_OLD,	"SCTP_GET_LOCAL_ADDRS_NUM_OLD"	},
+	XLAT(SCTP_GET_LOCAL_ADDRS_NUM_OLD),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS_OLD)
-	{ SCTP_GET_LOCAL_ADDRS_OLD,	"SCTP_GET_LOCAL_ADDRS_OLD"	},
+	XLAT(SCTP_GET_LOCAL_ADDRS_OLD),
 #endif
 #if defined(SCTP_SOCKOPT_CONNECTX_OLD)
-	{ SCTP_SOCKOPT_CONNECTX_OLD,	"SCTP_SOCKOPT_CONNECTX_OLD"	},
+	XLAT(SCTP_SOCKOPT_CONNECTX_OLD),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS)
-	{ SCTP_GET_PEER_ADDRS,		"SCTP_GET_PEER_ADDRS"		},
+	XLAT(SCTP_GET_PEER_ADDRS),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS)
-	{ SCTP_GET_LOCAL_ADDRS,		"SCTP_GET_LOCAL_ADDRS"		},
+	XLAT(SCTP_GET_LOCAL_ADDRS),
 #endif
 
 	{ 0,	NULL	},
@@ -1176,73 +1176,73 @@ static const struct xlat socksctpoptions[] = {
 
 #ifdef SOL_TCP
 static const struct xlat socktcpoptions[] = {
-	{ TCP_NODELAY,		"TCP_NODELAY"	},
-	{ TCP_MAXSEG,		"TCP_MAXSEG"	},
+	XLAT(TCP_NODELAY),
+	XLAT(TCP_MAXSEG),
 #ifdef TCP_CORK
-	{ TCP_CORK,		"TCP_CORK"	},
+	XLAT(TCP_CORK),
 #endif
 #ifdef TCP_KEEPIDLE
-	{ TCP_KEEPIDLE,		"TCP_KEEPIDLE"	},
+	XLAT(TCP_KEEPIDLE),
 #endif
 #ifdef TCP_KEEPINTVL
-	{ TCP_KEEPINTVL,	"TCP_KEEPINTVL"	},
+	XLAT(TCP_KEEPINTVL),
 #endif
 #ifdef TCP_KEEPCNT
-	{ TCP_KEEPCNT,		"TCP_KEEPCNT"	},
+	XLAT(TCP_KEEPCNT),
 #endif
 #ifdef TCP_SYNCNT
-	{ TCP_SYNCNT,		"TCP_SYNCNT"	},
+	XLAT(TCP_SYNCNT),
 #endif
 #ifdef TCP_LINGER2
-	{ TCP_LINGER2,		"TCP_LINGER2"	},
+	XLAT(TCP_LINGER2),
 #endif
 #ifdef TCP_DEFER_ACCEPT
-	{ TCP_DEFER_ACCEPT,	"TCP_DEFER_ACCEPT"	},
+	XLAT(TCP_DEFER_ACCEPT),
 #endif
 #ifdef TCP_WINDOW_CLAMP
-	{ TCP_WINDOW_CLAMP,	"TCP_WINDOW_CLAMP"	},
+	XLAT(TCP_WINDOW_CLAMP),
 #endif
 #ifdef TCP_INFO
-	{ TCP_INFO,		"TCP_INFO"	},
+	XLAT(TCP_INFO),
 #endif
 #ifdef TCP_QUICKACK
-	{ TCP_QUICKACK,		"TCP_QUICKACK"	},
+	XLAT(TCP_QUICKACK),
 #endif
 #ifdef TCP_CONGESTION
-	{ TCP_CONGESTION,	"TCP_CONGESTION"	},
+	XLAT(TCP_CONGESTION),
 #endif
 #ifdef TCP_MD5SIG
-	{ TCP_MD5SIG,		"TCP_MD5SIG"	},
+	XLAT(TCP_MD5SIG),
 #endif
 #ifdef TCP_COOKIE_TRANSACTIONS
-	{ TCP_COOKIE_TRANSACTIONS,	"TCP_COOKIE_TRANSACTIONS"	},
+	XLAT(TCP_COOKIE_TRANSACTIONS),
 #endif
 #ifdef TCP_THIN_LINEAR_TIMEOUTS
-	{ TCP_THIN_LINEAR_TIMEOUTS,	"TCP_THIN_LINEAR_TIMEOUTS"	},
+	XLAT(TCP_THIN_LINEAR_TIMEOUTS),
 #endif
 #ifdef TCP_THIN_DUPACK
-	{ TCP_THIN_DUPACK,	"TCP_THIN_DUPACK"	},
+	XLAT(TCP_THIN_DUPACK),
 #endif
 #ifdef TCP_USER_TIMEOUT
-	{ TCP_USER_TIMEOUT,	"TCP_USER_TIMEOUT"	},
+	XLAT(TCP_USER_TIMEOUT),
 #endif
 #ifdef TCP_REPAIR
-	{ TCP_REPAIR,		"TCP_REPAIR"	},
+	XLAT(TCP_REPAIR),
 #endif
 #ifdef TCP_REPAIR_QUEUE
-	{ TCP_REPAIR_QUEUE,	"TCP_REPAIR_QUEUE"	},
+	XLAT(TCP_REPAIR_QUEUE),
 #endif
 #ifdef TCP_QUEUE_SEQ
-	{ TCP_QUEUE_SEQ,	"TCP_QUEUE_SEQ"	},
+	XLAT(TCP_QUEUE_SEQ),
 #endif
 #ifdef TCP_REPAIR_OPTIONS
-	{ TCP_REPAIR_OPTIONS,	"TCP_REPAIR_OPTIONS"	},
+	XLAT(TCP_REPAIR_OPTIONS),
 #endif
 #ifdef TCP_FASTOPEN
-	{ TCP_FASTOPEN,		"TCP_FASTOPEN"	},
+	XLAT(TCP_FASTOPEN),
 #endif
 #ifdef TCP_TIMESTAMP
-	{ TCP_TIMESTAMP,	"TCP_TIMESTAMP"	},
+	XLAT(TCP_TIMESTAMP),
 #endif
 	{ 0,			NULL		},
 };
@@ -1296,25 +1296,25 @@ static const struct xlat icmpfilterflags[] = {
 #if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
 static const struct xlat af_packet_types[] = {
 #if defined(PACKET_HOST)
-	{ PACKET_HOST,			"PACKET_HOST"		},
+	XLAT(PACKET_HOST),
 #endif
 #if defined(PACKET_BROADCAST)
-	{ PACKET_BROADCAST,		"PACKET_BROADCAST"	},
+	XLAT(PACKET_BROADCAST),
 #endif
 #if defined(PACKET_MULTICAST)
-	{ PACKET_MULTICAST,		"PACKET_MULTICAST"	},
+	XLAT(PACKET_MULTICAST),
 #endif
 #if defined(PACKET_OTHERHOST)
-	{ PACKET_OTHERHOST,		"PACKET_OTHERHOST"	},
+	XLAT(PACKET_OTHERHOST),
 #endif
 #if defined(PACKET_OUTGOING)
-	{ PACKET_OUTGOING,		"PACKET_OUTGOING"	},
+	XLAT(PACKET_OUTGOING),
 #endif
 #if defined(PACKET_LOOPBACK)
-	{ PACKET_LOOPBACK,		"PACKET_LOOPBACK"	},
+	XLAT(PACKET_LOOPBACK),
 #endif
 #if defined(PACKET_FASTROUTE)
-	{ PACKET_FASTROUTE,		"PACKET_FASTROUTE"	},
+	XLAT(PACKET_FASTROUTE),
 #endif
 	{ 0,				NULL			},
 };
@@ -1466,10 +1466,10 @@ printsock(struct tcb *tcp, long addr, int addrlen)
 #if HAVE_SENDMSG
 static const struct xlat scmvals[] = {
 #ifdef SCM_RIGHTS
-	{ SCM_RIGHTS,		"SCM_RIGHTS"		},
+	XLAT(SCM_RIGHTS),
 #endif
 #ifdef SCM_CREDENTIALS
-	{ SCM_CREDENTIALS,	"SCM_CREDENTIALS"	},
+	XLAT(SCM_CREDENTIALS),
 #endif
 	{ 0,			NULL			}
 };