Replacing GNU old-style field designator extension

diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 1a859dac07a8398565a893c8c30dae8a4c219301..53deaa529d16067125e887636b3511597ac5a774 100644 (file)
--- 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 3feffbd90023d13bb0c4309e356f31fac65a9a73..b852da0429a61ba948d41e7a493319839ec8400d 100644 (file)
--- 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 22381c3d2825d320544db7ae5d28e76ff884a280..d6ef153ae440b7a834c3eddda4359e676f03072c 100644 (file)
--- 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 a0c28e72fac3704ec1102f18af08aa36d165f515..f41f52e7b84e009f7e49947b35b1f179acd1a2a0 100644 (file)
--- 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,
-
-  init: rip_init,
-  dump: rip_dump,
-  start: rip_start,
-  reconfigure: rip_reconfigure,
-  copy_config: rip_copy_config
+  .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
 };

diff --git a/proto/static/static.c b/proto/static/static.c
index d3a595d35fc0b7f5ebc656415a3dbceddcfb9e8f..8c31cdb8fe404a2b3c85a660e2a9603a7ca445e0 100644 (file)
--- 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 a2fb83d9252dc880996763f675c23b7696a1e1df..398d1ebbe1262c31669012d24221e6187b1c6d27 100644 (file)
--- 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 ccf35bf34aca9d9ef08919af05a6cd304248c263..3ae98df8414bf75312a9e598b0d9a62fa1c498b7 100644 (file)
--- 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;