Module Name: src
Committed By: mrg
Date: Thu Feb 8 08:04:45 UTC 2018
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_fil_compat.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_fil_compat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_fil_compat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.4 src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.5
--- src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.4 Thu Mar 20 20:43:12 2014
+++ src/sys/external/bsd/ipf/netinet/ip_fil_compat.c Thu Feb 8 08:04:45 2018
@@ -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 @@ frentry_4_1_0_to_current(ipf_main_softc_
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) {