[src/netbsd-8]: src/sys/external/bsd/ipf/netinet Pull up the following, reque...

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

details:   https://anonhg.NetBSD.org/src/rev/ef850219cacf
branches:  netbsd-8
changeset: 446950:ef850219cacf
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 26 13:18:53 2018 +0000

description:
Pull up the following, requested by sevan in ticket #1144:

        sys/external/bsd/ipf/netinet/fil.c      1.22

accidently commited to HEAD by mrg with a very misleading log message and
a bunch of unrelated changes - but really:

fix missing braces around a block (detected by newer gcc's indentation
checks).

diffstat:

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

diffs (34 lines):

diff -r a3574761efff -r ef850219cacf sys/external/bsd/ipf/netinet/fil.c
--- a/sys/external/bsd/ipf/netinet/fil.c        Tue Dec 25 11:26:48 2018 +0000
+++ b/sys/external/bsd/ipf/netinet/fil.c        Wed Dec 26 13:18:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.20.4.1 2017/09/23 17:28:41 snj Exp $ */
+/*     $NetBSD: fil.c,v 1.20.4.2 2018/12/26 13:18:53 martin Exp $      */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.20.4.1 2017/09/23 17:28:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.20.4.2 2018/12/26 13:18:53 martin Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -4893,13 +4893,14 @@
                        error = ipf_outobj(softc, data, fp, IPFOBJ_FRENTRY);
 
                        if (error == 0) {
-                               if ((f->fr_dsize != 0) && (uptr != NULL))
+                               if ((f->fr_dsize != 0) && (uptr != NULL)) {
                                        error = COPYOUT(f->fr_data, uptr,
                                                        f->fr_dsize);
                                        if (error != 0) {
                                                IPFERROR(28);
                                                error = EFAULT;
                                        }
+                               }
                                if (error == 0) {
                                        f->fr_hits = 0;
                                        f->fr_bytes = 0;