Switch to using C99 sparse initialisers for the type methods array.

Should make no binary difference.

Submitted by:	Gleb Smirnoff <glebius@cell.sick.ru>
Reviewed by:	Harti Brandt <harti@freebsd.org>
MFC after:	1 week

3 files changed, 28 insertions, 37 deletions

diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index ff4930d..636edb2 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -91,19 +91,16 @@ struct ng_btsocket_hci_raw_sec_filter {
 };
 
 /* Netgraph type descriptor */
-static struct ng_type   typestruct = {
-	NG_ABI_VERSION,
-	NG_BTSOCKET_HCI_RAW_NODE_TYPE,		/* typename */
-	NULL,					/* modevent */
-	ng_btsocket_hci_raw_node_constructor,	/* constructor */
-	ng_btsocket_hci_raw_node_rcvmsg,	/* control message */
-	ng_btsocket_hci_raw_node_shutdown,	/* destructor */
-	ng_btsocket_hci_raw_node_newhook,	/* new hook */
-	NULL,					/* find hook */
-	ng_btsocket_hci_raw_node_connect,	/* connect hook */
-	ng_btsocket_hci_raw_node_rcvdata,	/* data */
-	ng_btsocket_hci_raw_node_disconnect,	/* disconnect hook */
-	NULL					/* node command list */
+static struct ng_type typestruct = {
+	.version =	NG_ABI_VERSION,
+	.name =		NG_BTSOCKET_HCI_RAW_NODE_TYPE,
+	.constructor =	ng_btsocket_hci_raw_node_constructor,
+	.rcvmsg =	ng_btsocket_hci_raw_node_rcvmsg,
+	.shutdown =	ng_btsocket_hci_raw_node_shutdown,
+	.newhook =	ng_btsocket_hci_raw_node_newhook,
+	.connect =	ng_btsocket_hci_raw_node_connect,
+	.rcvdata =	ng_btsocket_hci_raw_node_rcvdata,
+	.disconnect =	ng_btsocket_hci_raw_node_disconnect,
 };
 
 /* Globals */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 6e23004..9f14274 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -78,18 +78,15 @@ static void		ng_btsocket_l2cap_rtclean (void *, int);
 
 /* Netgraph type descriptor */
 static struct ng_type	typestruct = {
-	NG_ABI_VERSION,
-	NG_BTSOCKET_L2CAP_NODE_TYPE,		/* typename */
-	NULL,					/* modevent */
-	ng_btsocket_l2cap_node_constructor,	/* constructor */
-	ng_btsocket_l2cap_node_rcvmsg,		/* control message */
-	ng_btsocket_l2cap_node_shutdown,	/* destructor */
-	ng_btsocket_l2cap_node_newhook,		/* new hook */
-	NULL,					/* find hook */
-	ng_btsocket_l2cap_node_connect,		/* connect hook */
-	ng_btsocket_l2cap_node_rcvdata,		/* data */
-	ng_btsocket_l2cap_node_disconnect,	/* disconnect hook */
-	NULL					/* node command list */
+	.version =	NG_ABI_VERSION,
+	.name =		NG_BTSOCKET_L2CAP_NODE_TYPE,
+	.constructor =	ng_btsocket_l2cap_node_constructor,
+	.rcvmsg =	ng_btsocket_l2cap_node_rcvmsg,
+	.shutdown =	ng_btsocket_l2cap_node_shutdown,
+	.newhook =	ng_btsocket_l2cap_node_newhook,
+	.connect =	ng_btsocket_l2cap_node_connect,
+	.rcvdata =	ng_btsocket_l2cap_node_rcvdata,
+	.disconnect =	ng_btsocket_l2cap_node_disconnect,
 };
 
 /* Globals */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index d630f86..07e3d85 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -89,18 +89,15 @@ static int		ng_btsocket_l2cap_raw_send_sync_ngmsg
 
 /* Netgraph type descriptor */
 static struct ng_type	typestruct = {
-	NG_ABI_VERSION,
-	NG_BTSOCKET_L2CAP_RAW_NODE_TYPE,	/* typename */
-	NULL,					/* modevent */
-	ng_btsocket_l2cap_raw_node_constructor,	/* constructor */
-	ng_btsocket_l2cap_raw_node_rcvmsg,	/* control message */
-	ng_btsocket_l2cap_raw_node_shutdown,	/* destructor */
-	ng_btsocket_l2cap_raw_node_newhook,	/* new hook */
-	NULL,					/* find hook */
-	ng_btsocket_l2cap_raw_node_connect,	/* connect hook */
-	ng_btsocket_l2cap_raw_node_rcvdata,	/* data */
-	ng_btsocket_l2cap_raw_node_disconnect,	/* disconnect hook */
-	NULL					/* node command list */
+	.version =	NG_ABI_VERSION,
+	.name =		NG_BTSOCKET_L2CAP_RAW_NODE_TYPE,
+	.constructor =	ng_btsocket_l2cap_raw_node_constructor,
+	.rcvmsg =	ng_btsocket_l2cap_raw_node_rcvmsg,
+	.shutdown =	ng_btsocket_l2cap_raw_node_shutdown,
+	.newhook =	ng_btsocket_l2cap_raw_node_newhook,
+	.connect =	ng_btsocket_l2cap_raw_node_connect,
+	.rcvdata =	ng_btsocket_l2cap_raw_node_rcvdata,
+	.disconnect =	ng_btsocket_l2cap_raw_node_disconnect,
 };
 
 /* Globals */