[src/trunk]: src/sys/external/bsd/ipf/netinet updates for GCC 6:

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

details:   https://anonhg.NetBSD.org/src/rev/191cc8799e0b
branches:  trunk
changeset: 829666:191cc8799e0b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Feb 08 08:04:45 2018 +0000

description:
updates for GCC 6:

- frentry_4_1_0_to_current() has duplicated code section, found via
  the indent checker.  didn't setup a test to confirm the bug/fix,
  but the other 2 similar functions are similar here now.

diffstat:

 sys/external/bsd/ipf/netinet/ip_fil_compat.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 9ea3221ec1b2 -r 191cc8799e0b sys/external/bsd/ipf/netinet/ip_fil_compat.c
--- a/sys/external/bsd/ipf/netinet/ip_fil_compat.c      Thu Feb 08 07:53:47 2018 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil_compat.c      Thu Feb 08 08:04:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil_compat.c,v 1.4 2014/03/20 20:43:12 christos Exp $       */
+/*     $NetBSD: ip_fil_compat.c,v 1.5 2018/02/08 08:04:45 mrg Exp $    */
 
 /*
  * Copyright (C) 2002-2012 by Darren Reed.
@@ -2274,7 +2274,6 @@
 
                        if ((offset & 7) != 0)
                                offset += 8 - (offset & 7);
-                               offset += 8 - (offset & 7);
                        error = ipf_in_compat(softc, &obj,
                                              fr->fr_names + offset, 0);
                        if (error == 0) {