Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys adjust fallthru comments to appease gcc7.



details:   https://anonhg.NetBSD.org/src/rev/3f82f3cc017b
branches:  trunk
changeset: 448545:3f82f3cc017b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 05 04:48:47 2019 +0000

description:
adjust fallthru comments to appease gcc7.

diffstat:

 sys/netinet/tcp_usrreq.c |  6 +++---
 sys/netinet6/in6.c       |  9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r aa1f92bac643 -r 3f82f3cc017b sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Tue Feb 05 04:47:59 2019 +0000
+++ b/sys/netinet/tcp_usrreq.c  Tue Feb 05 04:48:47 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.223 2019/01/28 12:53:01 martin Exp $  */
+/*     $NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.223 2019/01/28 12:53:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1689,8 +1689,8 @@
 
                in6_sin6_2_sin_in_sock((struct sockaddr *)&sa[0]);
                in6_sin6_2_sin_in_sock((struct sockaddr *)&sa[1]);
+#endif /* INET6 */
                /*FALLTHROUGH*/
-#endif /* INET6 */
        case PF_INET:
                si4[0] = (struct sockaddr_in*)&sa[0];
                si4[1] = (struct sockaddr_in*)&sa[1];
diff -r aa1f92bac643 -r 3f82f3cc017b sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Tue Feb 05 04:47:59 2019 +0000
+++ b/sys/netinet6/in6.c        Tue Feb 05 04:48:47 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.272 2018/11/29 09:54:23 ozaki-r Exp $        */
+/*     $NetBSD: in6.c,v 1.273 2019/02/05 04:48:47 mrg Exp $    */
 /*     $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $   */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.272 2018/11/29 09:54:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.273 2019/02/05 04:48:47 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -531,10 +531,11 @@
                        error = EADDRNOTAVAIL;
                        goto out;
                }
+#ifdef OSIOCAIFADDR_IN6
                /* FALLTHROUGH */
-#ifdef OSIOCAIFADDR_IN6
        case OSIOCAIFADDR_IN6:
 #endif
+               /* FALLTHROUGH */
        case SIOCAIFADDR_IN6:
                /*
                 * We always require users to specify a valid IPv6 address for
@@ -674,8 +675,8 @@
 #ifdef OSIOCAIFADDR_IN6
        case OSIOCAIFADDR_IN6:
                in6_aliasreq50_to_in6_aliasreq(ifra);
+#endif
                /*FALLTHROUGH*/
-#endif
        case SIOCAIFADDR_IN6:
        {
                struct in6_addrlifetime *lt;



Home | Main Index | Thread Index | Old Index