From 5467719bc0bbe658d980fbb1ad7ebd2756e8cc4b Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 10 Dec 2016 21:04:12 +0000 Subject: [PATCH] use array notation --- lib/libnpf/npf.c | 7 +++---- lib/libnpf/npf.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/libnpf/npf.c b/lib/libnpf/npf.c index 8b57d2e89cbb..e9f6d6ccdd51 100644 --- a/lib/libnpf/npf.c +++ b/lib/libnpf/npf.c @@ -1,4 +1,4 @@ -/* $NetBSD: npf.c,v 1.38 2016/12/10 19:07:22 christos Exp $ */ +/* $NetBSD: npf.c,v 1.39 2016/12/10 21:04:12 christos Exp $ */ /*- * Copyright (c) 2010-2015 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.38 2016/12/10 19:07:22 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.39 2016/12/10 21:04:12 christos Exp $"); #include #include @@ -1249,9 +1249,8 @@ _npf_debug_addif(nl_config_t *ncf, const char *ifname) prop_object_release(ifdict); } - int -npf_nat_lookup(int fd, int af, npf_addr_t **addr, in_port_t *port, +npf_nat_lookup(int fd, int af, npf_addr_t *addr[2], in_port_t port[2], int proto, int dir) { prop_dictionary_t conn_dict, conn_res = NULL; diff --git a/lib/libnpf/npf.h b/lib/libnpf/npf.h index b16ebef5b6e3..bb8c0e600c7b 100644 --- a/lib/libnpf/npf.h +++ b/lib/libnpf/npf.h @@ -1,4 +1,4 @@ -/* $NetBSD: npf.h,v 1.29 2016/12/10 05:37:55 christos Exp $ */ +/* $NetBSD: npf.h,v 1.30 2016/12/10 21:04:12 christos Exp $ */ /*- * Copyright (c) 2011-2014 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ int npf_rproc_insert(nl_config_t *, nl_rproc_t *); nl_nat_t * npf_nat_create(int, u_int, const char *, int, npf_addr_t *, npf_netmask_t, in_port_t); int npf_nat_insert(nl_config_t *, nl_nat_t *, pri_t); -int npf_nat_lookup(int, int, npf_addr_t **, in_port_t *, int, int); +int npf_nat_lookup(int, int, npf_addr_t *[2], in_port_t [2], int, int); nl_table_t * npf_table_create(const char *, u_int, int); int npf_table_add_entry(nl_table_t *, int,