diff options
| author | Roman Kurakin <rik@FreeBSD.org> | 2004-05-29 13:17:28 +0000 |
|---|---|---|
| committer | Roman Kurakin <rik@FreeBSD.org> | 2004-05-29 13:17:28 +0000 |
| commit | 24f6353dc4ed947f8b6ac14bd4dd757eba31c859 (patch) | |
| tree | d1b8696ccf572d4655430c095a4c86ff669ae68b /sys/dev/cp | |
| parent | 991fc65a92691d0d81c3dfda275dc949b6c8dc5b (diff) | |
| download | src-24f6353dc4ed947f8b6ac14bd4dd757eba31c859.tar.gz src-24f6353dc4ed947f8b6ac14bd4dd757eba31c859.zip | |
Switch to using C99 sparse initialisers for the type methods array.
Requested by: harti
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=129837
Diffstat (limited to 'sys/dev/cp')
| -rw-r--r-- | sys/dev/cp/if_cp.c | 32 |
1 files changed, 9 insertions, 23 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,\ |