aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-11-29 13:35:14 -0800
committerRoland McGrath <roland@hack.frob.com>2012-11-29 13:35:14 -0800
commite10c4e4fdb3b90f398c0f26dde0143c2558834b5 (patch)
tree711e264a54419f9a3220d727b47452281b45004b
parent2af1b3285313519cc884fb86fdf61cbc77f92ea1 (diff)
downloadglibc-e10c4e4fdb3b90f398c0f26dde0143c2558834b5.tar
glibc-e10c4e4fdb3b90f398c0f26dde0143c2558834b5.tar.gz
glibc-e10c4e4fdb3b90f398c0f26dde0143c2558834b5.tar.bz2
glibc-e10c4e4fdb3b90f398c0f26dde0143c2558834b5.zip
Fix a strict-alias warning in tst-inet6_rth.
-rw-r--r--ChangeLog4
-rw-r--r--inet/tst-inet6_rth.c14
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 98f62bf879..643a052520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-29 Roland McGrath <roland@hack.frob.com>
+
+ * inet/tst-inet6_rth.c (do_test): Use a union rather than type punning.
+
2012-11-28 Jeff Law <law@redhat.com>
[BZ #13761]
diff --git a/inet/tst-inet6_rth.c b/inet/tst-inet6_rth.c
index 4c5c90ac01..549d717c7d 100644
--- a/inet/tst-inet6_rth.c
+++ b/inet/tst-inet6_rth.c
@@ -66,20 +66,24 @@ inet6_rth_segments returned wrong value after loop with third inet6_rth_add");
goto out;
}
- char buf2[1000];
- if (inet6_rth_reverse (p, buf2) != 0)
+ union
+ {
+ char buffer[1000];
+ struct ip6_rthdr0 rthdr0;
+ } buf2;
+ if (inet6_rth_reverse (p, buf2.buffer) != 0)
{
puts ("first inet6_rth_reverse call failed");
res = 1;
goto out;
}
- if (((struct ip6_rthdr0 *) buf2)->ip6r0_segleft != nseg)
+ if (buf2.rthdr0.ip6r0_segleft != nseg)
{
puts ("segleft after first inet6_rth_reverse wrong");
res = 1;
}
- if (inet6_rth_segments (p) != inet6_rth_segments (buf2))
+ if (inet6_rth_segments (p) != inet6_rth_segments (buf2.buffer))
{
puts ("number of seconds after first inet6_rth_reverse differs");
res = 1;
@@ -88,7 +92,7 @@ inet6_rth_segments returned wrong value after loop with third inet6_rth_add");
for (int i = 0; i < nseg; ++i)
{
- struct in6_addr *addr = inet6_rth_getaddr (buf2, i);
+ struct in6_addr *addr = inet6_rth_getaddr (buf2.buffer, i);
if (addr == NULL)
{
printf ("call %d of first inet6_rth_getaddr failed\n",