From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 23 Apr 2025 01:53:56 +0000 (+0200)
Subject: Silence some warnings
X-Git-Tag: v2.17.1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cff6a0c0155191ef4db216c49c58a74f36da9ed7;p=thirdparty%2Fbird.git

Silence some warnings
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e75afaeac..0b402e6ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -728,6 +728,16 @@ build-netlab:
     - sudo ./stop
     - sudo ./runtest -s v2 -m check $TEST_NAME
 
+test-babel-base:
+  <<: *test-base
+  variables:
+    TEST_NAME: cf-babel-base
+
+test-babel-auth:
+  <<: *test-base
+  variables:
+    TEST_NAME: cf-babel-auth
+
 test-ospf-base:
   <<: *test-base
   variables:
@@ -858,16 +868,6 @@ test-ibgp-flat:
   variables:
     TEST_NAME: cf-ibgp-flat
 
-test-babel-base:
-  <<: *test-base
-  variables:
-    TEST_NAME: cf-babel-base
-
-test-babel-auth:
-  <<: *test-base
-  variables:
-    TEST_NAME: cf-babel-auth
-
 test-rip-base:
   <<: *test-base
   variables:
diff --git a/lib/ip_test.c b/lib/ip_test.c
index 057c2ef76..dcf863faf 100644
--- a/lib/ip_test.c
+++ b/lib/ip_test.c
@@ -237,22 +237,22 @@ t_ip6_shift_left(void)
   ip6_addr a = ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449);
 
   struct { int n; ip6_addr val; } test_vectors[] = {
-      0, ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449),
-      9, ip6_build(0x1B17B83E, 0x09B725CA, 0x22ECE6E1, 0xCA889200),
-     18, ip6_build(0x2F707C13, 0x6E4B9445, 0xD9CDC395, 0x11240000),
-     27, ip6_build(0xE0F826DC, 0x97288BB3, 0x9B872A22, 0x48000000),
-     36, ip6_build(0xF04DB92E, 0x51176737, 0x0E544490, 0x00000000),
-     45, ip6_build(0x9B725CA2, 0x2ECE6E1C, 0xA8892000, 0x00000000),
-     54, ip6_build(0xE4B9445D, 0x9CDC3951, 0x12400000, 0x00000000),
-     63, ip6_build(0x7288BB39, 0xB872A224, 0x80000000, 0x00000000),
-     72, ip6_build(0x11767370, 0xE5444900, 0x00000000, 0x00000000),
-     81, ip6_build(0xECE6E1CA, 0x88920000, 0x00000000, 0x00000000),
-     90, ip6_build(0xCDC39511, 0x24000000, 0x00000000, 0x00000000),
-     99, ip6_build(0x872A2248, 0x00000000, 0x00000000, 0x00000000),
-    108, ip6_build(0x54449000, 0x00000000, 0x00000000, 0x00000000),
-    117, ip6_build(0x89200000, 0x00000000, 0x00000000, 0x00000000),
-    126, ip6_build(0x40000000, 0x00000000, 0x00000000, 0x00000000),
-    128, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000000),
+    {   0, ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449) },
+    {   9, ip6_build(0x1B17B83E, 0x09B725CA, 0x22ECE6E1, 0xCA889200) },
+    {  18, ip6_build(0x2F707C13, 0x6E4B9445, 0xD9CDC395, 0x11240000) },
+    {  27, ip6_build(0xE0F826DC, 0x97288BB3, 0x9B872A22, 0x48000000) },
+    {  36, ip6_build(0xF04DB92E, 0x51176737, 0x0E544490, 0x00000000) },
+    {  45, ip6_build(0x9B725CA2, 0x2ECE6E1C, 0xA8892000, 0x00000000) },
+    {  54, ip6_build(0xE4B9445D, 0x9CDC3951, 0x12400000, 0x00000000) },
+    {  63, ip6_build(0x7288BB39, 0xB872A224, 0x80000000, 0x00000000) },
+    {  72, ip6_build(0x11767370, 0xE5444900, 0x00000000, 0x00000000) },
+    {  81, ip6_build(0xECE6E1CA, 0x88920000, 0x00000000, 0x00000000) },
+    {  90, ip6_build(0xCDC39511, 0x24000000, 0x00000000, 0x00000000) },
+    {  99, ip6_build(0x872A2248, 0x00000000, 0x00000000, 0x00000000) },
+    { 108, ip6_build(0x54449000, 0x00000000, 0x00000000, 0x00000000) },
+    { 117, ip6_build(0x89200000, 0x00000000, 0x00000000, 0x00000000) },
+    { 126, ip6_build(0x40000000, 0x00000000, 0x00000000, 0x00000000) },
+    { 128, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000000) },
   };
 
   for (uint i = 0; i < ARRAY_SIZE(test_vectors); i++)
@@ -267,22 +267,22 @@ t_ip6_shift_right(void)
   ip6_addr a = ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449);
 
   struct { int n; ip6_addr val; } test_vectors[] = {
-      0, ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449),
-      9, ip6_build(0x004686C5, 0xEE0F826D, 0xC97288BB, 0x39B872A2),
-     18, ip6_build(0x00002343, 0x62F707C1, 0x36E4B944, 0x5D9CDC39),
-     27, ip6_build(0x00000011, 0xA1B17B83, 0xE09B725C, 0xA22ECE6E),
-     36, ip6_build(0x00000000, 0x08D0D8BD, 0xC1F04DB9, 0x2E511767),
-     45, ip6_build(0x00000000, 0x0004686C, 0x5EE0F826, 0xDC97288B),
-     54, ip6_build(0x00000000, 0x00000234, 0x362F707C, 0x136E4B94),
-     63, ip6_build(0x00000000, 0x00000001, 0x1A1B17B8, 0x3E09B725),
-     72, ip6_build(0x00000000, 0x00000000, 0x008D0D8B, 0xDC1F04DB),
-     81, ip6_build(0x00000000, 0x00000000, 0x00004686, 0xC5EE0F82),
-     90, ip6_build(0x00000000, 0x00000000, 0x00000023, 0x4362F707),
-     99, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x11A1B17B),
-    108, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x0008D0D8),
-    117, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000468),
-    126, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000002),
-    128, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000000),
+    {   0, ip6_build(0x8D0D8BDC, 0x1F04DB92, 0xE5117673, 0x70E54449) },
+    {   9, ip6_build(0x004686C5, 0xEE0F826D, 0xC97288BB, 0x39B872A2) },
+    {  18, ip6_build(0x00002343, 0x62F707C1, 0x36E4B944, 0x5D9CDC39) },
+    {  27, ip6_build(0x00000011, 0xA1B17B83, 0xE09B725C, 0xA22ECE6E) },
+    {  36, ip6_build(0x00000000, 0x08D0D8BD, 0xC1F04DB9, 0x2E511767) },
+    {  45, ip6_build(0x00000000, 0x0004686C, 0x5EE0F826, 0xDC97288B) },
+    {  54, ip6_build(0x00000000, 0x00000234, 0x362F707C, 0x136E4B94) },
+    {  63, ip6_build(0x00000000, 0x00000001, 0x1A1B17B8, 0x3E09B725) },
+    {  72, ip6_build(0x00000000, 0x00000000, 0x008D0D8B, 0xDC1F04DB) },
+    {  81, ip6_build(0x00000000, 0x00000000, 0x00004686, 0xC5EE0F82) },
+    {  90, ip6_build(0x00000000, 0x00000000, 0x00000023, 0x4362F707) },
+    {  99, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x11A1B17B) },
+    { 108, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x0008D0D8) },
+    { 117, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000468) },
+    { 126, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000002) },
+    { 128, ip6_build(0x00000000, 0x00000000, 0x00000000, 0x00000000) },
   };
 
   for (uint i = 0; i < ARRAY_SIZE(test_vectors); i++)
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index f5008f6cf..dcb76e05c 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -260,7 +260,7 @@ bgp_find_ao_key_(list *l, int send_id, int recv_id)
   return NULL;
 }
 
-static inline struct bgp_ao_key *
+static inline struct bgp_ao_key * UNUSED
 bgp_find_ao_key(struct bgp_proto *p, int send_id, int recv_id)
 { return bgp_find_ao_key_(&p->ao.keys, send_id, recv_id); }
 
diff --git a/sysdep/bsd/sysio.h b/sysdep/bsd/sysio.h
index be65630bc..316bd0a52 100644
--- a/sysdep/bsd/sysio.h
+++ b/sysdep/bsd/sysio.h
@@ -229,43 +229,43 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen)
  */
 
 int
-sk_get_ao_info(sock *s, struct ao_info *val)
+sk_get_ao_info(sock *s UNUSED, struct ao_info *val UNUSED)
 {
   ERR_MSG("TCP-AO not supported");
 }
 
 int
-sk_get_active_ao_keys(sock *s, int *current_key, int *rnext_key)
+sk_get_active_ao_keys(sock *s UNUSED, int *current_key UNUSED, int *rnext_key UNUSED)
 {
   ERR_MSG("TCP-AO not supported");
 }
 
 bool
-tcp_ao_alg_known(int algorithm)
+tcp_ao_alg_known(int algorithm UNUSED)
 {
   return 0;
 }
 
 int
-sk_add_ao_key(sock *s, ip_addr prefix, int pxlen, struct iface *ifa, const struct ao_key *key, bool current, bool rnext)
+sk_add_ao_key(sock *s UNUSED, ip_addr prefix UNUSED, int pxlen UNUSED, struct iface *ifa UNUSED, const struct ao_key *key UNUSED, bool current UNUSED, bool rnext UNUSED)
 {
   ERR_MSG("TCP-AO not supported");
 }
 
 int
-sk_delete_ao_key(sock *s, ip_addr prefix, int pxlen, struct iface *ifa, const struct ao_key *key, const struct ao_key *current, const struct ao_key *rnext)
+sk_delete_ao_key(sock *s UNUSED, ip_addr prefix UNUSED, int pxlen UNUSED, struct iface *ifa UNUSED, const struct ao_key *key UNUSED, const struct ao_key *current UNUSED, const struct ao_key *rnext UNUSED)
 {
   ERR_MSG("TCP-AO not supported");
 }
 
 int
-sk_set_rnext_ao_key(sock *s, const struct ao_key *key)
+sk_set_rnext_ao_key(sock *s UNUSED, const struct ao_key *key UNUSED)
 {
   ERR_MSG("TCP-AO not supported");
 }
 
 int
-sk_check_ao_keys(sock *s, const struct ao_key **keys, int num, const char *name)
+sk_check_ao_keys(sock *s UNUSED, const struct ao_key **keys UNUSED, int num UNUSED, const char *name UNUSED)
 {
   errno = 0;
   s->err = "TCP-AO not supported";
@@ -275,13 +275,13 @@ sk_check_ao_keys(sock *s, const struct ao_key **keys, int num, const char *name)
 }
 
 void
-sk_dump_ao_info(sock *s, struct dump_request *dreq)
+sk_dump_ao_info(sock *s UNUSED, struct dump_request *dreq UNUSED)
 {
   RDUMP("TCP-AO not supported\n");
 }
 
 void
-sk_dump_ao_keys(sock *s, struct dump_request *dreq)
+sk_dump_ao_keys(sock *s UNUSED, struct dump_request *dreq UNUSED)
 {
   RDUMP("TCP-AO not supported\n");
 }