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

Requested by:	harti

MFC after:	1 week
This commit is contained in:
Roman Kurakin 2004-05-29 13:17:28 +00:00
parent 991fc65a92
commit 24f6353dc4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=129837
3 changed files with 27 additions and 67 deletions

View File

@ -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,\

View File

@ -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

View File

@ -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