tests: Correctly align variable type in tests

New compilers are noticing that the tests are compiling with
a pointer for the bgpd_privs variable while the bgp library
that is being linked against is not a pointer.  Since
these tests had the declaration just to make the compiler
happy, let's actually align the variable type to make the
compiler even happier.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit fcf6dce79a2e1ee4b7a5b4bb565f1755cda0d1f4)

diff --git a/tests/bgpd/test_aspath.c b/tests/bgpd/test_aspath.c
index c2d39752ab4099fed1c01792ddcc90f12945c911..1dbabc940330325c106cd1f05c7f2027eeaa1ef0 100644 (file)
--- a/tests/bgpd/test_aspath.c
+++ b/tests/bgpd/test_aspath.c
@@ -40,7 +40,7 @@
 #define FAILED VT100_RED "failed" VT100_RESET
 
 /* need these to link in libbgp */
-struct zebra_privs_t *bgpd_privs = NULL;
+struct zebra_privs_t bgpd_privs = {};
 struct thread_master *master = NULL;
 
 static int failed = 0;

diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c
index 3568411387f704e39b0e9d5f9419822214f5ba30..44d15d6014c3ed6f829e4589ee7ad2667525a0e4 100644 (file)
--- a/tests/bgpd/test_capability.c
+++ b/tests/bgpd/test_capability.c
@@ -44,7 +44,7 @@
 #define OPT_PARAM  2
 
 /* need these to link in libbgp */
-struct zebra_privs_t *bgpd_privs = NULL;
+struct zebra_privs_t bgpd_privs = {};
 struct thread_master *master = NULL;
 
 static int failed = 0;

diff --git a/tests/bgpd/test_ecommunity.c b/tests/bgpd/test_ecommunity.c
index 317bfff8ab55782828714d5f66283f74356c27d3..7147e3faf3aea08d03d0e6d905f30591c1e3c5b1 100644 (file)
--- a/tests/bgpd/test_ecommunity.c
+++ b/tests/bgpd/test_ecommunity.c
@@ -30,7 +30,7 @@
 #include "bgpd/bgp_ecommunity.h"
 
 /* need these to link in libbgp */
-struct zebra_privs_t *bgpd_privs = NULL;
+struct zebra_privs_t bgpd_privs = {};
 struct thread_master *master = NULL;
 
 static int failed = 0;

diff --git a/tests/bgpd/test_mp_attr.c b/tests/bgpd/test_mp_attr.c
index 909930d6bc97d88121419b3672b22740f5b13b89..c5ce5d3cd2c01872392c79ee859eacf16f4b1269 100644 (file)
--- a/tests/bgpd/test_mp_attr.c
+++ b/tests/bgpd/test_mp_attr.c
@@ -49,7 +49,7 @@
 #define OPT_PARAM  2
 
 /* need these to link in libbgp */
-struct zebra_privs_t *bgpd_privs = NULL;
+struct zebra_privs_t bgpd_privs = {};
 struct thread_master *master = NULL;
 
 static int failed = 0;

diff --git a/tests/bgpd/test_packet.c b/tests/bgpd/test_packet.c
index 27afa6a1216dd77cb97979c31185b2eec62c0a15..2ce8b561bbb14b88255dc55ca85918f5d2f2e34a 100644 (file)
--- a/tests/bgpd/test_packet.c
+++ b/tests/bgpd/test_packet.c
@@ -37,7 +37,7 @@
 #include "bgpd/bgp_network.h"
 
 /* need these to link in libbgp */
-struct zebra_privs_t *bgpd_privs = NULL;
+struct zebra_privs_t bgpd_privs = {};
 struct thread_master *master = NULL;
 
 static struct bgp *bgp;