Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).
This commit is contained in:
martin 2018-12-26 13:18:53 +00:00
parent 1349c23f6e
commit aee4e6a31d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/external/bsd/ipf/netinet/fil.c vendored
View File

@ -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 @@ extern struct timeout ipf_slowtimer_ch;
#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 @@ frrequest(ipf_main_softc_t *softc, int unit, ioctlcmd_t req, void *data,
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;