From 4a591d4b947e0abc0ad013ca1b75da27c6922be5 Mon Sep 17 00:00:00 2001 From: Pavel Tvrdik Date: Wed, 3 Dec 2014 10:10:34 +0100 Subject: [PATCH] Replacing GNU old-style field designator extension --- nest/rt-dev.c | 12 +++++------ proto/bgp/bgp.c | 28 +++++++++++++------------- proto/pipe/pipe.c | 24 +++++++++++----------- proto/rip/rip.c | 22 ++++++++++----------- proto/static/static.c | 20 +++++++++---------- sysdep/unix/krt.c | 46 +++++++++++++++++++++---------------------- sysdep/unix/log.c | 4 ++-- 7 files changed, 78 insertions(+), 78 deletions(-) diff --git a/nest/rt-dev.c b/nest/rt-dev.c index 1a859dac..53deaa52 100644 --- a/nest/rt-dev.c +++ b/nest/rt-dev.c @@ -112,10 +112,10 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src) } struct protocol proto_device = { - name: "Direct", - template: "direct%d", - preference: DEF_PREF_DIRECT, - init: dev_init, - reconfigure: dev_reconfigure, - copy_config: dev_copy_config + .name = "Direct", + .template = "direct%d", + .preference = DEF_PREF_DIRECT, + .init = dev_init, + .reconfigure = dev_reconfigure, + .copy_config = dev_copy_config }; diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 3feffbd9..b852da04 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1431,18 +1431,18 @@ bgp_show_proto_info(struct proto *P) } struct protocol proto_bgp = { - name: "BGP", - template: "bgp%d", - attr_class: EAP_BGP, - preference: DEF_PREF_BGP, - init: bgp_init, - start: bgp_start, - shutdown: bgp_shutdown, - cleanup: bgp_cleanup, - reconfigure: bgp_reconfigure, - copy_config: bgp_copy_config, - get_status: bgp_get_status, - get_attr: bgp_get_attr, - get_route_info: bgp_get_route_info, - show_proto_info: bgp_show_proto_info + .name = "BGP", + .template = "bgp%d", + .attr_class = EAP_BGP, + .preference = DEF_PREF_BGP, + .init = bgp_init, + .start = bgp_start, + .shutdown = bgp_shutdown, + .cleanup = bgp_cleanup, + .reconfigure = bgp_reconfigure, + .copy_config = bgp_copy_config, + .get_status = bgp_get_status, + .get_attr = bgp_get_attr, + .get_route_info = bgp_get_route_info, + .show_proto_info = bgp_show_proto_info }; diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index 22381c3d..d6ef153a 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -336,16 +336,16 @@ pipe_show_proto_info(struct proto *P) struct protocol proto_pipe = { - name: "Pipe", - template: "pipe%d", - multitable: 1, - preference: DEF_PREF_PIPE, - postconfig: pipe_postconfig, - init: pipe_init, - start: pipe_start, - cleanup: pipe_cleanup, - reconfigure: pipe_reconfigure, - copy_config: pipe_copy_config, - get_status: pipe_get_status, - show_proto_info: pipe_show_proto_info + .name = "Pipe", + .template = "pipe%d", + .multitable = 1, + .preference = DEF_PREF_PIPE, + .postconfig = pipe_postconfig, + .init = pipe_init, + .start = pipe_start, + .cleanup = pipe_cleanup, + .reconfigure = pipe_reconfigure, + .copy_config = pipe_copy_config, + .get_status = pipe_get_status, + .show_proto_info = pipe_show_proto_info }; diff --git a/proto/rip/rip.c b/proto/rip/rip.c index a0c28e72..f41f52e7 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -1046,16 +1046,16 @@ rip_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_rip = { - name: "RIP", - template: "rip%d", - attr_class: EAP_RIP, - preference: DEF_PREF_RIP, - get_route_info: rip_get_route_info, - get_attr: rip_get_attr, + .name = "RIP", + .template = "rip%d", + .attr_class = EAP_RIP, + .preference = DEF_PREF_RIP, + .get_route_info = rip_get_route_info, + .get_attr = rip_get_attr, - init: rip_init, - dump: rip_dump, - start: rip_start, - reconfigure: rip_reconfigure, - copy_config: rip_copy_config + .init = rip_init, + .dump = rip_dump, + .start = rip_start, + .reconfigure = rip_reconfigure, + .copy_config = rip_copy_config }; diff --git a/proto/static/static.c b/proto/static/static.c index d3a595d3..8c31cdb8 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -528,16 +528,16 @@ static_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_static = { - name: "Static", - template: "static%d", - preference: DEF_PREF_STATIC, - init: static_init, - dump: static_dump, - start: static_start, - shutdown: static_shutdown, - cleanup: static_cleanup, - reconfigure: static_reconfigure, - copy_config: static_copy_config + .name = "Static", + .template = "static%d", + .preference = DEF_PREF_STATIC, + .init = static_init, + .dump = static_dump, + .start = static_start, + .shutdown = static_shutdown, + .cleanup = static_cleanup, + .reconfigure = static_reconfigure, + .copy_config = static_copy_config }; static void diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index a2fb83d9..398d1ebb 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -277,15 +277,15 @@ kif_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_unix_iface = { - name: "Device", - template: "device%d", - preference: DEF_PREF_DIRECT, - preconfig: kif_preconfig, - init: kif_init, - start: kif_start, - shutdown: kif_shutdown, - reconfigure: kif_reconfigure, - copy_config: kif_copy_config + .name = "Device", + .template = "device%d", + .preference = DEF_PREF_DIRECT, + .preconfig = kif_preconfig, + .init = kif_init, + .start = kif_start, + .shutdown = kif_shutdown, + .reconfigure = kif_reconfigure, + .copy_config = kif_copy_config }; /* @@ -1198,20 +1198,20 @@ krt_get_attr(eattr * a, byte * buf, int buflen UNUSED) struct protocol proto_unix_kernel = { - name: "Kernel", - template: "kernel%d", - attr_class: EAP_KRT, - preference: DEF_PREF_INHERITED, - preconfig: krt_preconfig, - postconfig: krt_postconfig, - init: krt_init, - start: krt_start, - shutdown: krt_shutdown, - reconfigure: krt_reconfigure, - copy_config: krt_copy_config, - get_attr: krt_get_attr, + .name = "Kernel", + .template = "kernel%d", + .attr_class = EAP_KRT, + .preference = DEF_PREF_INHERITED, + .preconfig = krt_preconfig, + .postconfig = krt_postconfig, + .init = krt_init, + .start = krt_start, + .shutdown = krt_shutdown, + .reconfigure = krt_reconfigure, + .copy_config = krt_copy_config, + .get_attr = krt_get_attr, #ifdef KRT_ALLOW_LEARN - dump: krt_dump, - dump_attrs: krt_dump_attrs, + .dump = krt_dump, + .dump_attrs = krt_dump_attrs, #endif }; diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c index ccf35bf3..3ae98df8 100644 --- a/sysdep/unix/log.c +++ b/sysdep/unix/log.c @@ -261,7 +261,7 @@ default_log_list(int debug, int init, char **syslog_name) #ifdef HAVE_SYSLOG if (!debug) { - static struct log_config lc_syslog = { mask: ~0 }; + static struct log_config lc_syslog = { .mask = ~0 }; add_tail(&init_log_list, &lc_syslog.n); *syslog_name = bird_name; if (!init) @@ -269,7 +269,7 @@ default_log_list(int debug, int init, char **syslog_name) } #endif - static struct log_config lc_stderr = { mask: ~0, terminal_flag: 1 }; + static struct log_config lc_stderr = { .mask = ~0, .terminal_flag = 1 }; lc_stderr.fh = stderr; add_tail(&init_log_list, &lc_stderr.n); return &init_log_list;