[src/trunk]: src/usr.bin/fstat avoid pointer gymnastics

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86b2cc755d39
branches:  trunk
changeset: 790634:86b2cc755d39
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 18 20:18:42 2013 +0000

description:
avoid pointer gymnastics

diffstat:

 usr.bin/fstat/fstat.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 3fd1d0798360 -r 86b2cc755d39 usr.bin/fstat/fstat.c
--- a/usr.bin/fstat/fstat.c     Fri Oct 18 20:17:59 2013 +0000
+++ b/usr.bin/fstat/fstat.c     Fri Oct 18 20:18:42 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstat.c,v 1.100 2012/11/25 00:36:23 christos Exp $     */
+/*     $NetBSD: fstat.c,v 1.101 2013/10/18 20:18:42 christos Exp $     */
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)fstat.c    8.3 (Berkeley) 5/2/95";
 #else
-__RCSID("$NetBSD: fstat.c,v 1.100 2012/11/25 00:36:23 christos Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.101 2013/10/18 20:18:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -895,6 +895,7 @@
 {
        char addr[256], serv[256];
        struct sockaddr_in6 sin6;
+       uint16_t ad2;
        const int niflags = nflg ? (NI_NUMERICHOST|NI_NUMERICSERV) : 0;
 
        (void)memset(&sin6, 0, sizeof(sin6));
@@ -903,10 +904,9 @@
        sin6.sin6_addr = *a;
        sin6.sin6_port = htons(p);
 
-       if (IN6_IS_ADDR_LINKLOCAL(a) &&
-           *(u_int16_t *)&sin6.sin6_addr.s6_addr[2] != 0) {
-               sin6.sin6_scope_id =
-                       ntohs(*(uint16_t *)&sin6.sin6_addr.s6_addr[2]);
+       memcpy(&ad2, &sin6.sin6_addr.s6_addr[2], sizeof(ad2));
+       if (IN6_IS_ADDR_LINKLOCAL(a) && ad2 != 0) {
+               sin6.sin6_scope_id = ntohs(ad2);
                sin6.sin6_addr.s6_addr[2] = 0;
                sin6.sin6_addr.s6_addr[3] = 0;
        }