summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--babeld/babel_main.c2
-rw-r--r--bfdd/bfdd.c2
-rw-r--r--bgpd/bgp_main.c2
-rw-r--r--eigrpd/eigrp_main.c2
-rw-r--r--isisd/isis_main.c2
-rw-r--r--ldpd/ldpd.c2
-rw-r--r--lib/libfrr.h2
-rw-r--r--lib/northbound.c3
-rw-r--r--lib/northbound.h3
-rw-r--r--nhrpd/nhrp_main.c2
-rw-r--r--ospf6d/ospf6_main.c2
-rw-r--r--ospfd/ospf_main.c2
-rw-r--r--pbrd/pbr_main.c2
-rw-r--r--pimd/pim_main.c2
-rw-r--r--ripd/rip_main.c2
-rw-r--r--ripngd/ripng_main.c2
-rw-r--r--sharpd/sharp_main.c2
-rw-r--r--staticd/static_main.c2
-rw-r--r--tests/lib/northbound/test_oper_data.c2
-rw-r--r--vrrpd/vrrp_main.c2
-rw-r--r--zebra/main.c2
21 files changed, 23 insertions, 21 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 4bb840815..bb3378f4f 100644
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -136,7 +136,7 @@ struct option longopts[] =
{ 0 }
};
-static const struct frr_yang_module_info *babeld_yang_modules[] =
+static const struct frr_yang_module_info *const babeld_yang_modules[] =
{
&frr_interface_info,
};
diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index a91fa3d04..a9528646d 100644
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -109,7 +109,7 @@ static struct quagga_signal_t bfd_signals[] = {
},
};
-static const struct frr_yang_module_info *bfdd_yang_modules[] = {
+static const struct frr_yang_module_info *const bfdd_yang_modules[] = {
&frr_interface_info,
&frr_bfdd_info,
};
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 6b91a2cf1..08c5d3468 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -360,7 +360,7 @@ static void bgp_vrf_terminate(void)
vrf_terminate();
}
-static const struct frr_yang_module_info *bgpd_yang_modules[] = {
+static const struct frr_yang_module_info *const bgpd_yang_modules[] = {
};
FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT,
diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index 299825dd1..0746b04ed 100644
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -137,7 +137,7 @@ struct quagga_signal_t eigrp_signals[] = {
},
};
-static const struct frr_yang_module_info *eigrpd_yang_modules[] = {
+static const struct frr_yang_module_info *const eigrpd_yang_modules[] = {
&frr_eigrpd_info,
&frr_interface_info,
};
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 2ef006518..7e79fdea1 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -162,7 +162,7 @@ struct quagga_signal_t isisd_signals[] = {
};
-static const struct frr_yang_module_info *isisd_yang_modules[] = {
+static const struct frr_yang_module_info *const isisd_yang_modules[] = {
&frr_interface_info,
#ifndef FABRICD
&frr_isisd_info,
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index a6f0519bd..533fc9ac8 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -177,7 +177,7 @@ static struct quagga_signal_t ldp_signals[] =
}
};
-static const struct frr_yang_module_info *ldpd_yang_modules[] = {
+static const struct frr_yang_module_info *const ldpd_yang_modules[] = {
};
FRR_DAEMON_INFO(ldpd, LDP,
diff --git a/lib/libfrr.h b/lib/libfrr.h
index e2b3db74a..f964c9e2a 100644
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -98,7 +98,7 @@ struct frr_daemon_info {
struct zebra_privs_t *privs;
- const struct frr_yang_module_info **yang_modules;
+ const struct frr_yang_module_info *const *yang_modules;
size_t n_yang_modules;
bool log_always;
diff --git a/lib/northbound.c b/lib/northbound.c
index debd46362..206a88d98 100644
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -1882,7 +1882,8 @@ static void nb_load_callbacks(const struct frr_yang_module_info *module)
}
void nb_init(struct thread_master *tm,
- const struct frr_yang_module_info *modules[], size_t nmodules)
+ const struct frr_yang_module_info *const modules[],
+ size_t nmodules)
{
unsigned int errors = 0;
diff --git a/lib/northbound.h b/lib/northbound.h
index f52fcc90c..76a11e518 100644
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -1010,7 +1010,8 @@ extern const char *nb_client_name(enum nb_client client);
* nmodules
* Size of the modules array.
*/
-extern void nb_init(struct thread_master *tm, const struct frr_yang_module_info *modules[],
+extern void nb_init(struct thread_master *tm,
+ const struct frr_yang_module_info *const modules[],
size_t nmodules);
/*
diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index c6c83614e..a781122b1 100644
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -116,7 +116,7 @@ static struct quagga_signal_t sighandlers[] = {
},
};
-static const struct frr_yang_module_info *nhrpd_yang_modules[] = {
+static const struct frr_yang_module_info *const nhrpd_yang_modules[] = {
&frr_interface_info,
};
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 61094c7cd..0fa5585b8 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -166,7 +166,7 @@ struct quagga_signal_t ospf6_signals[] = {
},
};
-static const struct frr_yang_module_info *ospf6d_yang_modules[] = {
+static const struct frr_yang_module_info *const ospf6d_yang_modules[] = {
&frr_interface_info,
};
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index bee7bbb21..f6cd0fc83 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -123,7 +123,7 @@ struct quagga_signal_t ospf_signals[] = {
},
};
-static const struct frr_yang_module_info *ospfd_yang_modules[] = {
+static const struct frr_yang_module_info *const ospfd_yang_modules[] = {
&frr_interface_info,
};
diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c
index faa3de42f..b228847f0 100644
--- a/pbrd/pbr_main.c
+++ b/pbrd/pbr_main.c
@@ -112,7 +112,7 @@ struct quagga_signal_t pbr_signals[] = {
#define PBR_VTY_PORT 2615
-static const struct frr_yang_module_info *pbrd_yang_modules[] = {
+static const struct frr_yang_module_info *const pbrd_yang_modules[] = {
&frr_interface_info,
};
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 4090ce7f9..3f79b304e 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -72,7 +72,7 @@ struct zebra_privs_t pimd_privs = {
.cap_num_p = array_size(_caps_p),
.cap_num_i = 0};
-static const struct frr_yang_module_info *pimd_yang_modules[] = {
+static const struct frr_yang_module_info *const pimd_yang_modules[] = {
&frr_interface_info,
};
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 08cc51585..26504a857 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -113,7 +113,7 @@ static struct quagga_signal_t ripd_signals[] = {
},
};
-static const struct frr_yang_module_info *ripd_yang_modules[] = {
+static const struct frr_yang_module_info *const ripd_yang_modules[] = {
&frr_interface_info,
&frr_ripd_info,
};
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 3f2c0e9da..002434550 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -113,7 +113,7 @@ struct quagga_signal_t ripng_signals[] = {
},
};
-static const struct frr_yang_module_info *ripngd_yang_modules[] = {
+static const struct frr_yang_module_info *const ripngd_yang_modules[] = {
&frr_interface_info,
&frr_ripngd_info,
};
diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c
index 39453ee9a..a00106d68 100644
--- a/sharpd/sharp_main.c
+++ b/sharpd/sharp_main.c
@@ -111,7 +111,7 @@ struct quagga_signal_t sharp_signals[] = {
#define SHARP_VTY_PORT 2614
-static const struct frr_yang_module_info *sharpd_yang_modules[] = {
+static const struct frr_yang_module_info *const sharpd_yang_modules[] = {
};
FRR_DAEMON_INFO(sharpd, SHARP, .vty_port = SHARP_VTY_PORT,
diff --git a/staticd/static_main.c b/staticd/static_main.c
index 77243994e..18cb9638c 100644
--- a/staticd/static_main.c
+++ b/staticd/static_main.c
@@ -100,7 +100,7 @@ struct quagga_signal_t static_signals[] = {
},
};
-static const struct frr_yang_module_info *staticd_yang_modules[] = {
+static const struct frr_yang_module_info *const staticd_yang_modules[] = {
};
#define STATIC_VTY_PORT 2616
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index 3180f9f9f..a28830e08 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -271,7 +271,7 @@ const struct frr_yang_module_info frr_test_module_info = {
};
/* clang-format on */
-static const struct frr_yang_module_info *modules[] = {
+static const struct frr_yang_module_info *const modules[] = {
&frr_test_module_info,
};
diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c
index 6afb418ad..fface1718 100644
--- a/vrrpd/vrrp_main.c
+++ b/vrrpd/vrrp_main.c
@@ -105,7 +105,7 @@ struct quagga_signal_t vrrp_signals[] = {
},
};
-static const struct frr_yang_module_info *vrrp_yang_modules[] = {
+static const struct frr_yang_module_info *const vrrp_yang_modules[] = {
&frr_interface_info,
};
diff --git a/zebra/main.c b/zebra/main.c
index 334354eaa..838ad1cdf 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -229,7 +229,7 @@ struct quagga_signal_t zebra_signals[] = {
},
};
-static const struct frr_yang_module_info *zebra_yang_modules[] = {
+static const struct frr_yang_module_info *const zebra_yang_modules[] = {
&frr_interface_info,
};