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

Requested by:	harti

MFC after:	1 week

3 files changed, 27 insertions, 67 deletions

diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index 126b3b0ca9dd..d8d6268ad85c 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -2700,29 +2700,15 @@ static int cp_modevent (module_t mod, int type, void *unused)
 
 #ifdef NETGRAPH
 static struct ng_type typestruct = {
-#if __FreeBSD_version >= 500000
-	NG_ABI_VERSION,
-#else
-	NG_VERSION,
-#endif
-	NG_CP_NODE_TYPE,
-#if __FreeBSD_version < 500000 && (defined KLD_MODULE)
-	cp_modevent,
-#else
-	NULL,
-#endif
-	ng_cp_constructor,
-	ng_cp_rcvmsg,
-	ng_cp_rmnode,
-	ng_cp_newhook,
-	NULL,
-	ng_cp_connect,
-	ng_cp_rcvdata,
-#if __FreeBSD_version < 500000
-	NULL,
-#endif
-	ng_cp_disconnect,
-	NULL
+	.version	= NG_ABI_VERSION,
+	.name		= NG_CP_NODE_TYPE,
+	.constructor	= ng_cp_constructor,
+	.rcvmsg		= ng_cp_rcvmsg,
+	.shutdown	= ng_cp_rmnode,
+	.newhook	= ng_cp_newhook,
+	.connect	= ng_cp_connect,
+	.rcvdata	= ng_cp_rcvdata,
+	.disconnect	= ng_cp_disconnect,
 };
 #if __FreeBSD_version < 400000
 NETGRAPH_INIT_ORDERED (cp, &typestruct, SI_SUB_DRIVERS,\
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index d3df364023b2..bd6c97157586 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -2673,28 +2673,15 @@ static int ct_modevent (module_t mod, int type, void *unused)
 
 #ifdef NETGRAPH
 static struct ng_type typestruct = {
-#if __FreeBSD_version >= 500000
-	NG_ABI_VERSION,
-#else
-	NG_VERSION,
-#endif
-	NG_CT_NODE_TYPE,
-#if __FreeBSD_version < 500000 && (defined KLD_MODULE)
-	ct_modevent,
-#else
-	NULL,
-#endif
-	ng_ct_constructor,
-	ng_ct_rcvmsg,
-	ng_ct_rmnode,
-	ng_ct_newhook,
-	NULL,
-	ng_ct_connect,
-	ng_ct_rcvdata,
-#if __FreeBSD_version < 500000
-	NULL,
-#endif
-	ng_ct_disconnect
+	.version	= NG_ABI_VERSION,
+	.name		= NG_CT_NODE_TYPE,
+	.constructor	= ng_ct_constructor,
+	.rcvmsg		= ng_ct_rcvmsg,
+	.shutdown	= ng_ct_rmnode,
+	.newhook	= ng_ct_newhook,
+	.connect	= ng_ct_connect,
+	.rcvdata	= ng_ct_rcvdata,
+	.disconnect	= ng_ct_disconnect
 };
 
 #if __FreeBSD_version < 400000
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 6e6f3ff1b87e..8d63fa854ef2 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -3179,28 +3179,15 @@ static int cx_modevent (module_t mod, int type, void *unused)
 
 #ifdef NETGRAPH
 static struct ng_type typestruct = {
-#if __FreeBSD_version >= 500000
-	NG_ABI_VERSION,
-#else
-	NG_VERSION,
-#endif
-	NG_CX_NODE_TYPE,
-#if __FreeBSD_version < 500000 && defined KLD_MODULE
-	cx_modevent,
-#else
-	NULL,
-#endif
-	ng_cx_constructor,
-	ng_cx_rcvmsg,
-	ng_cx_rmnode,
-	ng_cx_newhook,
-	NULL,
-	ng_cx_connect,
-	ng_cx_rcvdata,
-#if __FreeBSD_version < 500000
-	NULL,
-#endif
-	ng_cx_disconnect
+	.version	= NG_ABI_VERSION,
+	.name		= NG_CX_NODE_TYPE,
+	.constructor	= ng_cx_constructor,
+	.rcvmsg		= ng_cx_rcvmsg,
+	.shutdown	= ng_cx_rmnode,
+	.newhook	= ng_cx_newhook,
+	.connect	= ng_cx_connect,
+	.rcvdata	= ng_cx_rcvdata,
+	.disconnect	= ng_cx_disconnect
 };
 
 #if __FreeBSD_version < 400000