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

5 files changed, 51 insertions, 60 deletions

diff --git a/sys/netgraph/atm/atmpif/ng_atmpif.c b/sys/netgraph/atm/atmpif/ng_atmpif.c
index b79117a..b5eb2e5 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif.c
@@ -199,18 +199,16 @@ static int		ng_atmpif_mod_event(module_t, int, void *);
  * Node type descriptor
  */
 static struct ng_type ng_atmpif_typestruct = {
-	NG_ABI_VERSION,			/* version */
-	NG_ATMPIF_NODE_TYPE,		/* name */
-	ng_atmpif_mod_event,		/* mod_event */
-	ng_atmpif_constructor,		/* constructor */
-	ng_atmpif_rcvmsg,		/* rcvmsg */
-	ng_atmpif_rmnode,		/* shutdown */
-	ng_atmpif_newhook,		/* newhook */
-	NULL,				/* findhook */
-	NULL,				/* connect */
-	ng_atmpif_rcvdata,		/* rcvdata */
-	ng_atmpif_disconnect,		/* disconnect */
-	ng_atmpif_cmdlist,		/* cmdlist */
+	.version =	NG_ABI_VERSION,
+	.name =		NG_ATMPIF_NODE_TYPE,
+	.mod_event =	ng_atmpif_mod_event,
+	.constructor =	ng_atmpif_constructor,
+	.rcvmsg =	ng_atmpif_rcvmsg,
+	.shutdown =	ng_atmpif_rmnode,
+	.newhook =	ng_atmpif_newhook,
+	.rcvdata =	ng_atmpif_rcvdata,
+	.disconnect =	ng_atmpif_disconnect,
+	.cmdlist =	ng_atmpif_cmdlist,
 };
 NETGRAPH_INIT(atmpif, &ng_atmpif_typestruct);
 
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index 1750cdd..f33f2c5 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -324,18 +324,17 @@ static ng_rcvdata_t	ng_atm_rcvdata;
 static ng_rcvdata_t	ng_atm_rcvdrop;
 
 static struct ng_type ng_atm_typestruct = {
-	NG_ABI_VERSION,
-	NG_ATM_NODE_TYPE,
-	ng_atm_mod_event,	/* Module event handler (optional) */
-	ng_atm_constructor,	/* Node constructor */
-	ng_atm_rcvmsg,		/* control messages come here */
-	ng_atm_shutdown,	/* reset, and free resources */
-	ng_atm_newhook,		/* first notification of new hook */
-	NULL,			/* findhook */
-	ng_atm_connect,		/* connect */
-	ng_atm_rcvdata,		/* rcvdata */
-	ng_atm_disconnect,	/* notify on disconnect */
-	ng_atm_cmdlist,
+	.version =	NG_ABI_VERSION,
+	.name =		NG_ATM_NODE_TYPE,
+	.mod_event =	ng_atm_mod_event,
+	.constructor =	ng_atm_constructor,
+	.rcvmsg =	ng_atm_rcvmsg,
+	.shutdown =	ng_atm_shutdown,
+	.newhook =	ng_atm_newhook,
+	.connect =	ng_atm_connect,
+	.rcvdata =	ng_atm_rcvdata,
+	.disconnect =	ng_atm_disconnect,
+	.cmdlist =	ng_atm_cmdlist,
 };
 NETGRAPH_INIT(atm, &ng_atm_typestruct);
 
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index aa1656a..10caa49 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -148,18 +148,16 @@ static ng_rcvdata_t	ng_sscfu_rcvlower;
 static int ng_sscfu_mod_event(module_t, int, void *);
 
 static struct ng_type ng_sscfu_typestruct = {
-	NG_ABI_VERSION,
-	NG_SSCFU_NODE_TYPE,
-	ng_sscfu_mod_event,	/* Module event handler (optional) */
-	ng_sscfu_constructor,	/* Node constructor */
-	ng_sscfu_rcvmsg,	/* control messages come here */
-	ng_sscfu_shutdown,	/* reset, and free resources */
-	ng_sscfu_newhook,	/* first notification of new hook */
-	NULL,			/* findhook */
-	NULL,			/* connect */
-	ng_sscfu_rcvupper,	/* rcvdata */
-	ng_sscfu_disconnect,	/* notify on disconnect */
-	ng_sscfu_cmdlist,
+	.version =	NG_ABI_VERSION,
+	.name =		NG_SSCFU_NODE_TYPE,
+	.mod_event =	ng_sscfu_mod_event,
+	.constructor =	ng_sscfu_constructor,
+	.rcvmsg =	ng_sscfu_rcvmsg,
+	.shutdown =	ng_sscfu_shutdown,
+	.newhook =	ng_sscfu_newhook,
+	.rcvdata =	ng_sscfu_rcvupper,
+	.disconnect =	ng_sscfu_disconnect,
+	.cmdlist =	ng_sscfu_cmdlist,
 };
 NETGRAPH_INIT(sscfu, &ng_sscfu_typestruct);
 
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index b87be7c..0d5906d 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -196,18 +196,16 @@ static ng_rcvdata_t	ng_sscop_rcvmanage;
 static int ng_sscop_mod_event(module_t, int, void *);
 
 static struct ng_type ng_sscop_typestruct = {
-	NG_ABI_VERSION,
-	NG_SSCOP_NODE_TYPE,
-	ng_sscop_mod_event,	/* Module event handler (optional) */
-	ng_sscop_constructor,	/* Node constructor */
-	ng_sscop_rcvmsg,	/* control messages come here */
-	ng_sscop_shutdown,	/* reset, and free resources */
-	ng_sscop_newhook,	/* first notification of new hook */
-	NULL,			/* findhook */
-	NULL,			/* connect */
-	ng_sscop_rcvlower,	/* rcvdata */
-	ng_sscop_disconnect,	/* notify on disconnect */
-	ng_sscop_cmdlist,
+	.version =	NG_ABI_VERSION,
+	.name =		NG_SSCOP_NODE_TYPE,
+	.mod_event =	ng_sscop_mod_event,
+	.constructor =	ng_sscop_constructor,
+	.rcvmsg =	ng_sscop_rcvmsg,
+	.shutdown =	ng_sscop_shutdown,
+	.newhook =	ng_sscop_newhook,
+	.rcvdata =	ng_sscop_rcvlower,
+	.disconnect =	ng_sscop_disconnect,
+	.cmdlist =	ng_sscop_cmdlist,
 };
 NETGRAPH_INIT(sscop, &ng_sscop_typestruct);
 
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index f823f60..494092e 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -185,18 +185,16 @@ static ng_rcvdata_t	ng_uni_rcvupper;
 static int ng_uni_mod_event(module_t, int, void *);
 
 static struct ng_type ng_uni_typestruct = {
-	NG_ABI_VERSION,
-	NG_UNI_NODE_TYPE,
-	ng_uni_mod_event,	/* Module event handler (optional) */
-	ng_uni_constructor,	/* Node constructor */
-	ng_uni_rcvmsg,		/* control messages come here */
-	ng_uni_shutdown,	/* reset, and free resources */
-	ng_uni_newhook,		/* first notification of new hook */
-	NULL,			/* findhook */
-	NULL,			/* connect */
-	ng_uni_rcvlower,	/* rcvdata */
-	ng_uni_disconnect,	/* notify on disconnect */
-	ng_uni_cmdlist,
+	.version =	NG_ABI_VERSION,
+	.name =		NG_UNI_NODE_TYPE,
+	.mod_event =	ng_uni_mod_event,
+	.constructor =	ng_uni_constructor,
+	.rcvmsg =	ng_uni_rcvmsg,
+	.shutdown =	ng_uni_shutdown,
+	.newhook =	ng_uni_newhook,
+	.rcvdata =	ng_uni_rcvlower,
+	.disconnect =	ng_uni_disconnect,
+	.cmdlist =	ng_uni_cmdlist,
 };
 NETGRAPH_INIT(uni, &ng_uni_typestruct);