*: make frr_yang_module_info const

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 4bb840815735e07d68c6894b872fac254b558bb3..bb3378f4f0449d80442c40e48922e827e392f296 100644 (file)
--- 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 a91fa3d04776ba038f398efd8caeb257f5cda561..a9528646df25c19cea325721f51e947251a975fa 100644 (file)
--- 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 6b91a2cf1f1609cb2bc26178fbceb1dae161d123..08c5d3468d422ed64935fa29431f7e950e6a15e9 100644 (file)
--- 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 299825dd1ba889a8998c303a380847178da4c148..0746b04edb79f0585e3766a69b9a632ddaff4b18 100644 (file)
--- 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 2ef0065180b895aaccf67b72d1fff43514f5744b..7e79fdea1535c7146e5dfd16601f1d04b7747117 100644 (file)
--- 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 a6f0519bd72940330c1524ba0ff13ce3c6fab1ba..533fc9ac81a8f0317c74302d9a2a64d83f3d7e4e 100644 (file)
--- 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 e2b3db74a3f762f292b6fa163c40a75765de286c..f964c9e2a13a6d0248256ead466a23dc6a41aa29 100644 (file)
--- 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 debd46362483364e5595c5fec8a9aba9725f0039..206a88d9800650d4de56b753f73fe90c4d93771e 100644 (file)
--- 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 f52fcc90cf08b23d2f6b10267726e5263c7f7209..76a11e518cc02806dd79786da86f9f38712434b8 100644 (file)
--- 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 c6c83614ef55111ad1976498976938e48b9c44d9..a781122b16a3b2699abb35da7adab1b435d222b5 100644 (file)
--- 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 61094c7cdba325055f60ab8c46740519dce7eaea..0fa5585b80b1e322a46ef21ac6e4c4f69f708a1d 100644 (file)
--- 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 bee7bbb21d02de10a4de2b09732534a3c33ab016..f6cd0fc833de968495fd778e6cc253f9c4fa7547 100644 (file)
--- 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 faa3de42f268718012078f110a9bea31324ae8e8..b228847f06036f4ad4ba26b1dd31a1bfc50668b7 100644 (file)
--- 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 4090ce7f9325eecb0d56309ef2d26900e8327ddd..3f79b304e5952617ae66b1a0cee77f9db05da58a 100644 (file)
--- 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 08cc5158569918069022d93c2f0312ede8cc98f7..26504a857d564a22aabee3fc07ec9ebbb1025db5 100644 (file)
--- 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 3f2c0e9da07cd787d82bbd1babda04fed3ef03a9..002434550032e85d411f31988150c888823b99d3 100644 (file)
--- 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 39453ee9adc1d49e6a2ad1047d65878818673ab2..a00106d686bff0bda98fe3cd99262437bc0140fb 100644 (file)
--- 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 77243994e2078bf2dd42dea755f620614b8623b3..18cb9638c975845fc098529db3c27d30ad51405a 100644 (file)
--- 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 3180f9f9f3fd252c86ddd7ac44bc742d61a04506..a28830e088468e6014e7ece0a366226812c5a2d2 100644 (file)
--- 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 6afb418ad0890351d589111e3e3320f97dcff81e..fface1718f6ad9f492b7c391e8bd873b0446e98f 100644 (file)
--- 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 334354eaae87997778115ec8a1b46d1d844ef67b..838ad1cdf8c32d968becc83d5e141062aa1bdab5 100644 (file)
--- 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,
 };