From dcace5669d81e83aea7a22539593b0f158eb224c Mon Sep 17 00:00:00 2001 From: ru Date: Wed, 9 Nov 2005 13:29:16 +0000 Subject: Use sparse initializers for "struct domain" and "struct protosw", so they are easier to follow for the human being. --- sys/netnatm/natm_proto.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'sys/netnatm') diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c index 6d7a951..1ff619f 100644 --- a/sys/netnatm/natm_proto.c +++ b/sys/netnatm/natm_proto.c @@ -57,30 +57,36 @@ static void natm_init(void); static struct domain natmdomain; static struct protosw natmsw[] = { -{ SOCK_STREAM, &natmdomain, PROTO_NATMAAL5, PR_CONNREQUIRED, - 0, 0, 0, 0, - 0, - 0, 0, 0, 0, - &natm_usrreqs +{ + .pr_type = SOCK_STREAM, + .pr_domain = &natmdomain, + .pr_protocol = PROTO_NATMAAL5, + .pr_flags = PR_CONNREQUIRED, + .pr_usrreqs = &natm_usrreqs }, -{ SOCK_DGRAM, &natmdomain, PROTO_NATMAAL5, PR_CONNREQUIRED | PR_ATOMIC, - 0, 0, 0, 0, - 0, - 0, 0, 0, 0, - &natm_usrreqs +{ + .pr_type = SOCK_DGRAM, + .pr_domain = &natmdomain, + .pr_protocol = PROTO_NATMAAL5, + .pr_flags = PR_CONNREQUIRED|PR_ATOMIC, + .pr_usrreqs = &natm_usrreqs }, -{ SOCK_STREAM, &natmdomain, PROTO_NATMAAL0, PR_CONNREQUIRED, - 0, 0, 0, 0, - 0, - 0, 0, 0, 0, - &natm_usrreqs +{ + .pr_type = SOCK_STREAM, + .pr_domain = &natmdomain, + .pr_protocol = PROTO_NATMAAL0, + .pr_flags = PR_CONNREQUIRED, + .pr_usrreqs = &natm_usrreqs }, }; -static struct domain natmdomain = - { AF_NATM, "natm", natm_init, 0, 0, - natmsw, &natmsw[sizeof(natmsw)/sizeof(natmsw[0])], 0, - 0, 0, 0}; +static struct domain natmdomain = { + .dom_family = AF_NATM, + .dom_name = "natm", + .dom_init = natm_init, + .dom_protosw = natmsw, + .dom_protoswNPROTOSW = &natmsw[sizeof(natmsw)/sizeof(natmsw[0])], +}; static int natmqmaxlen = 1000 /* IFQ_MAXLEN */; /* max # of packets on queue */ static struct ifqueue natmintrq; -- cgit v1.1