unittest_ipaddr: fix compile warnings

silence warnings like
 warning: test/test_ipaddr.cc:174:16: deprecated conversion from string
 constant to char* [-Wwrite-strings]

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index 1f58130104e5278c73ffde0448f9e54a3123c464..240a3a75b56dac3cedb3347336952ee8ebe82f7c 100644 (file)
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -19,6 +19,9 @@ static void ipv6(struct sockaddr_in6 *addr, const char *s) {
   ASSERT_EQ(1, err);
 }
 
+static char eth0[] = "eth0";
+static char eth1[] = "eth1";
+
 TEST(CommonIPAddr, TestNotFound)
 {
   struct ifaddrs one, two;
@@ -29,11 +32,11 @@ TEST(CommonIPAddr, TestNotFound)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.11.12.13");
   ipv6(&a_two, "2001:1234:5678:90ab::cdef");
@@ -53,11 +56,11 @@ TEST(CommonIPAddr, TestV4_Simple)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.11.12.13");
   ipv6(&a_two, "2001:1234:5678:90ab::cdef");
@@ -77,11 +80,11 @@ TEST(CommonIPAddr, TestV4_Prefix25)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.11.12.13");
   ipv4(&a_two, "10.11.12.129");
@@ -101,11 +104,11 @@ TEST(CommonIPAddr, TestV4_Prefix16)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.1.1.2");
   ipv4(&a_two, "10.2.1.123");
@@ -124,7 +127,7 @@ TEST(CommonIPAddr, TestV4_PrefixTooLong)
 
   one.ifa_next = NULL;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   ipv4(&a_one, "10.11.12.13");
   ipv4(&net, "10.11.12.12");
@@ -143,11 +146,11 @@ TEST(CommonIPAddr, TestV4_PrefixZero)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv6(&a_one, "2001:1234:5678:900F::cdef");
   ipv4(&a_two, "10.1.2.3");
@@ -167,11 +170,11 @@ TEST(CommonIPAddr, TestV6_Simple)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.11.12.13");
   ipv6(&a_two, "2001:1234:5678:90ab::cdef");
@@ -191,11 +194,11 @@ TEST(CommonIPAddr, TestV6_Prefix57)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv6(&a_one, "2001:1234:5678:900F::cdef");
   ipv6(&a_two, "2001:1234:5678:90ab::cdef");
@@ -214,7 +217,7 @@ TEST(CommonIPAddr, TestV6_PrefixTooLong)
 
   one.ifa_next = NULL;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   ipv6(&a_one, "2001:1234:5678:900F::cdef");
   ipv6(&net, "2001:1234:5678:900F::cdee");
@@ -233,11 +236,11 @@ TEST(CommonIPAddr, TestV6_PrefixZero)
 
   one.ifa_next = &two;
   one.ifa_addr = (struct sockaddr*)&a_one;
-  one.ifa_name = "eth0";
+  one.ifa_name = eth0;
 
   two.ifa_next = NULL;
   two.ifa_addr = (struct sockaddr*)&a_two;
-  two.ifa_name = "eth1";
+  two.ifa_name = eth1;
 
   ipv4(&a_one, "10.2.3.4");
   ipv6(&a_two, "2001:f00b::1");