From 47e81302686d72a31f28986462fe6ddadca6487c Mon Sep 17 00:00:00 2001
From: yasuoka <yasuoka@openbsd.org>
Date: Tue, 30 May 2017 17:22:00 +0000
Subject: [PATCH] Stop using __P macro.

---
 usr.sbin/npppd/common/addr_range.c | 12 +++---
 usr.sbin/npppd/common/addr_range.h | 14 +++----
 usr.sbin/npppd/common/debugutil.c  |  4 +-
 usr.sbin/npppd/common/hash.h       | 18 ++++-----
 usr.sbin/npppd/common/radish.h     | 50 +++++++++++--------------
 usr.sbin/npppd/npppd/fsm.c         | 20 +++++-----
 usr.sbin/npppd/npppd/fsm.h         | 59 +++++++++++++-----------------
 usr.sbin/npppd/npppd/lcp.c         | 26 ++++++-------
 usr.sbin/npppd/npppd/mppe.c        | 26 ++++++-------
 usr.sbin/npppd/npppd/npppd_pool.c  |  4 +-
 usr.sbin/npppd/npppd/ppp.h         | 10 ++---
 11 files changed, 114 insertions(+), 129 deletions(-)

diff --git a/usr.sbin/npppd/common/addr_range.c b/usr.sbin/npppd/common/addr_range.c
index 6157d57c3b0..539a60fb5ef 100644
--- a/usr.sbin/npppd/common/addr_range.c
+++ b/usr.sbin/npppd/common/addr_range.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: addr_range.c,v 1.5 2015/12/17 18:37:58 mmcc Exp $ */
+/*	$OpenBSD: addr_range.c,v 1.6 2017/05/30 17:22:00 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -56,7 +56,7 @@
  * Author:
  *	Yasuoka Masahiko <yasuoka@iij.ad.jp>
  *
- * $Id: addr_range.c,v 1.5 2015/12/17 18:37:58 mmcc Exp $
+ * $Id: addr_range.c,v 1.6 2017/05/30 17:22:00 yasuoka Exp $
  */
 #ifdef ADDR_RANGE_DEBUG
 #define IIJDEBUG
@@ -81,9 +81,9 @@ static int saved_errno;
 #endif
 #include "addr_range.h"
 
-static void  in_addr_range_list_uniq __P((struct in_addr_range **));
-static int   in_addr_range_list_add0 __P((struct in_addr_range **, u_int32_t, u_int32_t));
-static int   bitmask2masklen __P((u_int32_t));
+static void  in_addr_range_list_uniq(struct in_addr_range **);
+static int   in_addr_range_list_add0(struct in_addr_range **, u_int32_t, u_int32_t);
+static int   bitmask2masklen(u_int32_t);
 
 struct in_addr_range *
 in_addr_range_create()
@@ -373,7 +373,7 @@ static int bitmask2masklen(mask)
 #ifdef ADDR_RANGE_DEBUG
 #include <unistd.h>
 
-static void usage __P ((void));
+static void usage(void);
 
 static void
 usage()
diff --git a/usr.sbin/npppd/common/addr_range.h b/usr.sbin/npppd/common/addr_range.h
index 5f72a6b2c59..7f70bf44859 100644
--- a/usr.sbin/npppd/common/addr_range.h
+++ b/usr.sbin/npppd/common/addr_range.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: addr_range.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
+/*	$OpenBSD: addr_range.h,v 1.4 2017/05/30 17:22:00 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -38,12 +38,12 @@ struct in_addr_range {
 extern "C" {
 #endif
 
-struct in_addr_range  *in_addr_range_create __P((void));
-void                  in_addr_range_destroy __P((struct in_addr_range *));
-void                  in_addr_range_list_remove_all __P((struct in_addr_range **));
-int                   in_addr_range_list_includes __P((struct in_addr_range **, struct in_addr *));
-int                   in_addr_range_list_add __P((struct in_addr_range **, const char *));
-int                   main __P((int, char *[]));
+struct in_addr_range  *in_addr_range_create(void);
+void                  in_addr_range_destroy(struct in_addr_range *);
+void                  in_addr_range_list_remove_all(struct in_addr_range **);
+int                   in_addr_range_list_includes(struct in_addr_range **, struct in_addr *);
+int                   in_addr_range_list_add(struct in_addr_range **, const char *);
+int                   main(int, char *[]);
 
 #ifdef __cplusplus
 }
diff --git a/usr.sbin/npppd/common/debugutil.c b/usr.sbin/npppd/common/debugutil.c
index d5b50920a38..7f082abdba4 100644
--- a/usr.sbin/npppd/common/debugutil.c
+++ b/usr.sbin/npppd/common/debugutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debugutil.c,v 1.5 2015/12/17 08:01:55 tb Exp $ */
+/*	$OpenBSD: debugutil.c,v 1.6 2017/05/30 17:22:00 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -42,7 +42,7 @@ int debuglevel = 0;
 FILE *debugfp = NULL;
 static int prio_idx_inititialized = 0;
 
-static void  set_prio_idx_init __P((void));
+static void  set_prio_idx_init(void);
 
 #ifndef countof
 #define countof(x)	(sizeof((x)) / sizeof((x)[0]))
diff --git a/usr.sbin/npppd/common/hash.h b/usr.sbin/npppd/common/hash.h
index 4797ab3e78b..60462e584a5 100644
--- a/usr.sbin/npppd/common/hash.h
+++ b/usr.sbin/npppd/common/hash.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.h,v 1.2 2015/12/17 08:01:55 tb Exp $ */
+/*	$OpenBSD: hash.h,v 1.3 2017/05/30 17:22:00 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: hash.h,v 1.2 2015/12/17 08:01:55 tb Exp $ */
+/* $Id: hash.h,v 1.3 2017/05/30 17:22:00 yasuoka Exp $ */
 #ifndef HASH_H
 #define HASH_H
 
@@ -51,13 +51,13 @@ typedef struct {
 extern "C" {
 #endif
 hash_table  *hash_create(int (*)(const void *, const void *), uint32_t (*) (const void *, int), int);
-hash_link   *hash_first __P((hash_table *));
-hash_link   *hash_next __P((hash_table *));
-hash_link   *hash_lookup __P((hash_table *, const void *));
-int         hash_insert __P((hash_table *, const void *, void *));
-int         hash_delete __P((hash_table *, const void *, int));
-void        hash_delete_all __P((hash_table *, int));
-void        hash_free __P((hash_table *));
+hash_link   *hash_first(hash_table *);
+hash_link   *hash_next(hash_table *);
+hash_link   *hash_lookup(hash_table *, const void *);
+int         hash_insert(hash_table *, const void *, void *);
+int         hash_delete(hash_table *, const void *, int);
+void        hash_delete_all(hash_table *, int);
+void        hash_free(hash_table *);
 
 #ifdef __cplusplus
 }
diff --git a/usr.sbin/npppd/common/radish.h b/usr.sbin/npppd/common/radish.h
index 9e1c2c88306..2d0a44686ec 100644
--- a/usr.sbin/npppd/common/radish.h
+++ b/usr.sbin/npppd/common/radish.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radish.h,v 1.4 2016/09/21 04:45:23 yasuoka Exp $ */
+/*	$OpenBSD: radish.h,v 1.5 2017/05/30 17:22:00 yasuoka Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -39,14 +39,6 @@
  * Email: 	kazu@is.aist-nara.ac.jp
  */
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif /* __STDC__ */
-#endif /* __P */
-
 #ifdef RADISH
 #ifndef _NET_RADISH_H_
 #define _NET_RADISH_H_
@@ -98,32 +90,32 @@ struct radish_head {
  * prototype for radish functions
  */
 
-int rd_inithead __P((void **, int, int, int, int, int (*)(void *, void *)));
-struct sockaddr *rd_mask __P((struct sockaddr *, struct radish_head *, int *));
+int rd_inithead(void **, int, int, int, int, int (*)(void *, void *));
+struct sockaddr *rd_mask(struct sockaddr *, struct radish_head *, int *);
 
 #ifndef GENERIC_USE
-int rd_insert __P((struct sockaddr *, struct sockaddr *,
-		   struct radish_head *, struct rtentry *));
+int rd_insert(struct sockaddr *, struct sockaddr *,
+		   struct radish_head *, struct rtentry *);
 #else /* GENERIC_USE */
-int rd_insert __P((struct sockaddr *, struct sockaddr *,
-		   struct radish_head *, void *));
+int rd_insert(struct sockaddr *, struct sockaddr *,
+		   struct radish_head *, void *);
 #endif /* GENERIC_USE */
-int rd_glue __P((struct radish *, struct radish *, int, struct radish_head *));
-int rd_match __P((struct sockaddr *, struct radish_head *, struct radish **));
-int rd_match_next __P((struct sockaddr *, struct radish_head *, struct radish **, struct radish *));
+int rd_glue(struct radish *, struct radish *, int, struct radish_head *);
+int rd_match(struct sockaddr *, struct radish_head *, struct radish **);
+int rd_match_next(struct sockaddr *, struct radish_head *, struct radish **, struct radish *);
 #ifndef GENERIC_USE
-struct rtentry *rd_lookup __P((struct sockaddr *,
-			      struct sockaddr *, struct radish_head *));
-int rd_delete __P((struct sockaddr *, struct sockaddr *,
-		   struct radish_head *, struct rtentry **));
+struct rtentry *rd_lookup(struct sockaddr *,
+			      struct sockaddr *, struct radish_head *);
+int rd_delete(struct sockaddr *, struct sockaddr *,
+		   struct radish_head *, struct rtentry **);
 #else /* GENERIC_USE */
-void *rd_lookup __P((struct sockaddr *,
-			      struct sockaddr *, struct radish_head *));
-int rd_delete __P((struct sockaddr *, struct sockaddr *,
-		   struct radish_head *, void **));
+void *rd_lookup(struct sockaddr *,
+			      struct sockaddr *, struct radish_head *);
+int rd_delete(struct sockaddr *, struct sockaddr *,
+		   struct radish_head *, void **);
 #endif /* GENERIC_USE */
-void rd_unlink __P((struct radish *, struct radish *));
-int  rd_walktree __P((struct radish_head *, int (*)(struct radish *, void *), void *));
-int  rd_refines __P((void *, void *));
+void rd_unlink(struct radish *, struct radish *);
+int  rd_walktree(struct radish_head *, int (*)(struct radish *, void *), void *);
+int  rd_refines(void *, void *);
 #endif /* !_NET_RADISH_H_ */
 #endif /* RADISH */
diff --git a/usr.sbin/npppd/npppd/fsm.c b/usr.sbin/npppd/npppd/fsm.c
index ded98727b59..c566e7e9c9d 100644
--- a/usr.sbin/npppd/npppd/fsm.c
+++ b/usr.sbin/npppd/npppd/fsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsm.c,v 1.8 2016/03/16 04:58:34 yasuoka Exp $ */
+/*	$OpenBSD: fsm.c,v 1.9 2017/05/30 17:22:00 yasuoka Exp $ */
 
 /**@file
  * This file was adapted from NetBSD:/usr/src/usr.sbin/pppd/pppd/fsm.c
@@ -70,14 +70,14 @@
 static const char rcsid[] = RCSID;
 #endif
 
-static void fsm_timeout __P((void *));
-static void fsm_rconfreq __P((fsm *, int, u_char *, int));
-static void fsm_rconfack __P((fsm *, int, u_char *, int));
-static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int));
-static void fsm_rtermreq __P((fsm *, int, u_char *, int));
-static void fsm_rtermack __P((fsm *));
-static void fsm_rcoderej __P((fsm *, u_char *, int));
-static void fsm_sconfreq __P((fsm *, int));
+static void fsm_timeout(void *);
+static void fsm_rconfreq(fsm *, int, u_char *, int);
+static void fsm_rconfack(fsm *, int, u_char *, int);
+static void fsm_rconfnakrej(fsm *, int, int, u_char *, int);
+static void fsm_rtermreq(fsm *, int, u_char *, int);
+static void fsm_rtermack(fsm *);
+static void fsm_rcoderej(fsm *, u_char *, int);
+static void fsm_sconfreq(fsm *, int);
 
 #define PROTO_NAME(f)	((f)->callbacks->proto_name)
 
@@ -539,7 +539,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
     u_char *inp;
     int len;
 {
-    int (*proc) __P((fsm *, u_char *, int));
+    int (*proc)(fsm *, u_char *, int);
     int ret;
 
     if (id != f->reqid || f->seen_ack)	/* Expected id? */
diff --git a/usr.sbin/npppd/npppd/fsm.h b/usr.sbin/npppd/npppd/fsm.h
index 9c054d8321e..e793e792b63 100644
--- a/usr.sbin/npppd/npppd/fsm.h
+++ b/usr.sbin/npppd/npppd/fsm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsm.h,v 1.5 2012/05/08 13:15:11 yasuoka Exp $ */
+/*	$OpenBSD: fsm.h,v 1.6 2017/05/30 17:22:00 yasuoka Exp $ */
 /*	$NetBSD: fsm.h,v 1.10 2000/09/23 22:39:35 christos Exp $	*/
 
 /*
@@ -74,34 +74,27 @@ typedef struct fsm {
 
 
 typedef struct fsm_callbacks {
-    void (*resetci)		/* Reset our Configuration Information */
-		__P((fsm *));
-    int  (*cilen)		/* Length of our Configuration Information */
-		__P((fsm *));
+    void (*resetci)(fsm *);	/* Reset our Configuration Information */
+    int  (*cilen)(fsm *);	/* Length of our Configuration Information */
     void (*addci) 		/* Add our Configuration Information */
-		__P((fsm *, u_char *, int *));
+		(fsm *, u_char *, int *);
     int  (*ackci)		/* ACK our Configuration Information */
-		__P((fsm *, u_char *, int));
+		(fsm *, u_char *, int);
     int  (*nakci)		/* NAK our Configuration Information */
-		__P((fsm *, u_char *, int));
+		(fsm *, u_char *, int);
     int  (*rejci)		/* Reject our Configuration Information */
-		__P((fsm *, u_char *, int));
+		(fsm *, u_char *, int);
     int  (*reqci)		/* Request peer's Configuration Information */
-		__P((fsm *, u_char *, int *, int));
-    void (*up)			/* Called when fsm reaches OPENED state */
-		__P((fsm *));
-    void (*down)		/* Called when fsm leaves OPENED state */
-		__P((fsm *));
-    void (*starting)		/* Called when we want the lower layer */
-		__P((fsm *));
-    void (*finished)		/* Called when we don't want the lower layer */
-		__P((fsm *));
-    void (*protreject)		/* Called when Protocol-Reject received */
-		__P((int));
-    void (*retransmit)		/* Retransmission is necessary */
-		__P((fsm *));
+		(fsm *, u_char *, int *, int);
+    void (*up)(fsm *);		/* Called when fsm reaches OPENED state */
+    void (*down)(fsm *);	/* Called when fsm leaves OPENED state */
+		
+    void (*starting)(fsm *);	/* Called when we want the lower layer */
+    void (*finished)(fsm *);	/* Called when we don't want the lower layer */
+    void (*protreject)(int);	/* Called when Protocol-Reject received */
+    void (*retransmit)(fsm *);	/* Retransmission is necessary */
     int  (*extcode)		/* Called when unknown code received */
-		__P((fsm *, int, int, u_char *, int));
+		(fsm *, int, int, u_char *, int);
     char *proto_name;		/* String name for protocol (for messages) */
 } fsm_callbacks;
 
@@ -157,16 +150,16 @@ typedef struct fsm_callbacks {
 /*
  * Prototypes
  */
-void fsm_evtimer_timeout __P((int, short, void *));
-void fsm_init __P((fsm *));
-void fsm_lowerup __P((fsm *));
-void fsm_lowerdown __P((fsm *));
-void fsm_open __P((fsm *));
-void fsm_close __P((fsm *, const char *));
-void fsm_input __P((fsm *, u_char *, int));
-void fsm_protreject __P((fsm *));
-void fsm_sdata __P((fsm *, int, int, u_char *, int));
-void fsm_log __P((fsm *, uint32_t, const char *, ...)) __attribute__((__format__ (__printf__, 3, 4)));
+void fsm_evtimer_timeout(int, short, void *);
+void fsm_init(fsm *);
+void fsm_lowerup(fsm *);
+void fsm_lowerdown(fsm *);
+void fsm_open(fsm *);
+void fsm_close(fsm *, const char *);
+void fsm_input(fsm *, u_char *, int);
+void fsm_protreject(fsm *);
+void fsm_sdata(fsm *, int, int, u_char *, int);
+void fsm_log(fsm *, uint32_t, const char *, ...) __attribute__((__format__ (__printf__, 3, 4)));
 
 
 #endif
diff --git a/usr.sbin/npppd/npppd/lcp.c b/usr.sbin/npppd/npppd/lcp.c
index 5bb621d81ed..cd74b48e274 100644
--- a/usr.sbin/npppd/npppd/lcp.c
+++ b/usr.sbin/npppd/npppd/lcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.c,v 1.16 2015/12/05 18:43:36 mmcc Exp $ */
+/*	$OpenBSD: lcp.c,v 1.17 2017/05/30 17:22:00 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: lcp.c,v 1.16 2015/12/05 18:43:36 mmcc Exp $ */
+/* $Id: lcp.c,v 1.17 2017/05/30 17:22:00 yasuoka Exp $ */
 /**@file
  * This file provides LCP related functions.
  *<pre>
@@ -67,17 +67,17 @@
 #define	ECHOREP			0x0a
 #define	IDENTIFICATION		0x0c
 
-static void  lcp_resetci __P((fsm *));
-static void  lcp_addci __P((fsm *, u_char *, int *));
-static int   lcp_reqci __P((fsm *, u_char *, int *, int));
-static int   lcp_ackci __P((fsm *, u_char *, int));
-static int   lcp_nakci __P((fsm *, u_char *, int));
-static int   lcp_rejci __P((fsm *, u_char *, int));
-static int   lcp_cilen __P((fsm *));
-static void  lcp_open __P((fsm *));
-static void  lcp_down __P((fsm *));
-static void  lcp_finished __P((fsm *));
-static int   lcp_ext __P((fsm *, int, int, u_char *, int));
+static void  lcp_resetci(fsm *);
+static void  lcp_addci(fsm *, u_char *, int *);
+static int   lcp_reqci(fsm *, u_char *, int *, int);
+static int   lcp_ackci(fsm *, u_char *, int);
+static int   lcp_nakci(fsm *, u_char *, int);
+static int   lcp_rejci(fsm *, u_char *, int);
+static int   lcp_cilen(fsm *);
+static void  lcp_open(fsm *);
+static void  lcp_down(fsm *);
+static void  lcp_finished(fsm *);
+static int   lcp_ext(fsm *, int, int, u_char *, int);
 static void  lcp_timeout(void *);
 static void  lcp_reset_timeout(void *);
 static int   lcp_proxy_recv_ci(fsm *, u_char *, int);
diff --git a/usr.sbin/npppd/npppd/mppe.c b/usr.sbin/npppd/npppd/mppe.c
index 9416f65c089..3319d14bb8e 100644
--- a/usr.sbin/npppd/npppd/mppe.c
+++ b/usr.sbin/npppd/npppd/mppe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mppe.c,v 1.13 2015/12/05 18:43:36 mmcc Exp $ */
+/*	$OpenBSD: mppe.c,v 1.14 2017/05/30 17:22:00 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: mppe.c,v 1.13 2015/12/05 18:43:36 mmcc Exp $ */
+/* $Id: mppe.c,v 1.14 2017/05/30 17:22:00 yasuoka Exp $ */
 /**@file
  *
  * The implementation of MPPE(Microsoft Point-To-Point Encryption Protocol)
@@ -81,17 +81,17 @@
 #define COHER_GE(a, b) (!COHER_LT((a), (b)))
 
 
-static const char  *mppe_bits_to_string __P((uint32_t));
-static void        mppe_log __P((mppe *, uint32_t, const char *, ...)) __printflike(3,4);
-static int         mppe_rc4_init __P((mppe *, mppe_rc4_t *, int));
-static int         mppe_rc4_setkey __P((mppe *, mppe_rc4_t *));
-static int         mppe_rc4_setoldkey __P((mppe *, mppe_rc4_t *, uint16_t));
-static void        mppe_rc4_destroy __P((mppe *, mppe_rc4_t *));
-static void        mppe_rc4_encrypt __P((mppe *, mppe_rc4_t *, int, u_char *, u_char *));
-static void        *rc4_create_ctx __P((void));
-static int         rc4_key __P((void *, int, u_char *));
-static void        rc4 __P((void *, int, u_char *, u_char *));
-static void        GetNewKeyFromSHA __P((u_char *, u_char *, int, u_char *));
+static const char  *mppe_bits_to_string(uint32_t);
+static void        mppe_log(mppe *, uint32_t, const char *, ...) __printflike(3,4);
+static int         mppe_rc4_init(mppe *, mppe_rc4_t *, int);
+static int         mppe_rc4_setkey(mppe *, mppe_rc4_t *);
+static int         mppe_rc4_setoldkey(mppe *, mppe_rc4_t *, uint16_t);
+static void        mppe_rc4_destroy(mppe *, mppe_rc4_t *);
+static void        mppe_rc4_encrypt(mppe *, mppe_rc4_t *, int, u_char *, u_char *);
+static void        *rc4_create_ctx(void);
+static int         rc4_key(void *, int, u_char *);
+static void        rc4(void *, int, u_char *, u_char *);
+static void        GetNewKeyFromSHA(u_char *, u_char *, int, u_char *);
 
 /**
  * initializing mppe context.
diff --git a/usr.sbin/npppd/npppd/npppd_pool.c b/usr.sbin/npppd/npppd/npppd_pool.c
index 6589e5c7873..8ae54b77695 100644
--- a/usr.sbin/npppd/npppd/npppd_pool.c
+++ b/usr.sbin/npppd/npppd/npppd_pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npppd_pool.c,v 1.9 2015/12/05 18:43:36 mmcc Exp $ */
+/*	$OpenBSD: npppd_pool.c,v 1.10 2017/05/30 17:22:00 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -71,7 +71,7 @@
 #define	SA(sin4)	((struct sockaddr *)(sin4))
 
 #define SHUFLLE_MARK 0xffffffffL
-static int  npppd_pool_log __P((npppd_pool *, int, const char *, ...)) __printflike(3, 4);
+static int  npppd_pool_log(npppd_pool *, int, const char *, ...) __printflike(3, 4);
 static int  is_valid_host_address (uint32_t);
 static int  npppd_pool_regist_radish(npppd_pool *, struct in_addr_range *,
     struct sockaddr_npppd *, int );
diff --git a/usr.sbin/npppd/npppd/ppp.h b/usr.sbin/npppd/npppd/ppp.h
index f2a0fdb5d6e..7afa96d6aee 100644
--- a/usr.sbin/npppd/npppd/ppp.h
+++ b/usr.sbin/npppd/npppd/ppp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp.h,v 1.19 2015/12/05 16:10:31 yasuoka Exp $ */
+/*	$OpenBSD: ppp.h,v 1.20 2017/05/30 17:22:00 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -801,10 +801,10 @@ void       chap_input (chap *, u_char *, int);
 int        chap_proxy_authen_prepare (chap *, dialin_proxy_info *);
 
 #ifdef USE_NPPPD_EAP_RADIUS
-void       eap_init __P((eap *, npppd_ppp *));
-void       eap_stop __P((eap *));
-void       eap_start __P((eap *));
-void       eap_input __P((eap *, u_char *, int));
+void       eap_init(eap *, npppd_ppp *);
+void       eap_stop(eap *);
+void       eap_start(eap *);
+void       eap_input(eap *, u_char *, int);
 #endif
 
 #ifdef	USE_NPPPD_MPPE
-- 
2.20.1