[src/trunk]: src/sys/netipsec Make key_cmpspidx_exactly and key_cmpspidx_with...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2045c72ddfae
branches:  trunk
changeset: 353866:2045c72ddfae
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri May 26 08:10:46 2017 +0000

description:
Make key_cmpspidx_exactly and key_cmpspidx_withmask static

diffstat:

 sys/netipsec/key.c |  13 +++++++++----
 sys/netipsec/key.h |   4 +---
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 5f22545ea361 -r 2045c72ddfae sys/netipsec/key.c
--- a/sys/netipsec/key.c        Fri May 26 08:09:44 2017 +0000
+++ b/sys/netipsec/key.c        Fri May 26 08:10:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.144 2017/05/26 08:10:46 ozaki-r Exp $        */
 /*     $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $        */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.144 2017/05/26 08:10:46 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -461,6 +461,11 @@
 static u_int16_t key_satype2proto (u_int8_t);
 static u_int8_t key_proto2satype (u_int16_t);
 
+static int key_cmpspidx_exactly(const struct secpolicyindex *,
+    const struct secpolicyindex *);
+static int key_cmpspidx_withmask(const struct secpolicyindex *,
+    const struct secpolicyindex *);
+
 static int key_getspi (struct socket *, struct mbuf *,
        const struct sadb_msghdr *);
 static u_int32_t key_do_getnewspi (const struct sadb_spirange *,
@@ -4238,7 +4243,7 @@
  *     1 : equal
  *     0 : not equal
  */
-int
+static int
 key_cmpspidx_exactly(
        const struct secpolicyindex *spidx0,
        const struct secpolicyindex *spidx1)
@@ -4268,7 +4273,7 @@
  *     1 : equal
  *     0 : not equal
  */
-int
+static int
 key_cmpspidx_withmask(
        const struct secpolicyindex *spidx0,
        const struct secpolicyindex *spidx1)
diff -r 5f22545ea361 -r 2045c72ddfae sys/netipsec/key.h
--- a/sys/netipsec/key.h        Fri May 26 08:09:44 2017 +0000
+++ b/sys/netipsec/key.h        Fri May 26 08:10:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.h,v 1.17 2017/05/26 08:09:44 ozaki-r Exp $ */
+/*     $NetBSD: key.h,v 1.18 2017/05/26 08:10:46 ozaki-r Exp $ */
 /*     $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $        */
 /*     $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $    */
 
@@ -92,8 +92,6 @@
 struct secpolicy *key_msg2sp (const struct sadb_x_policy *, size_t, int *);
 struct mbuf *key_sp2msg (const struct secpolicy *);
 int key_ismyaddr (const struct sockaddr *);
-int key_cmpspidx_exactly (const struct secpolicyindex *, const struct secpolicyindex *);
-int key_cmpspidx_withmask (const struct secpolicyindex *, const struct secpolicyindex *);
 int key_spdacquire (const struct secpolicy *);
 u_long key_random (void);
 void key_randomfill (void *, size_t);