summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2011-11-05 09:20:36 +0000
committeryasuoka <yasuoka@openbsd.org>2011-11-05 09:20:36 +0000
commitbf2df231eb5da66591befe5c7ee97e5bfb9bfb50 (patch)
tree64518b6155429d7b4186fdf01419e3112021bc6a
parentMissing bits for new keys and buffer indexes, from Tiago Cunha (diff)
downloadwireguard-openbsd-bf2df231eb5da66591befe5c7ee97e5bfb9bfb50.tar.xz
wireguard-openbsd-bf2df231eb5da66591befe5c7ee97e5bfb9bfb50.zip
Remove unnecessary #include's. From Michael W. Bombardieri.
No binary change.
-rw-r--r--usr.sbin/pppoe/client.c8
-rw-r--r--usr.sbin/pppoe/common.c7
-rw-r--r--usr.sbin/pppoe/pppoe.c5
-rw-r--r--usr.sbin/pppoe/server.c7
-rw-r--r--usr.sbin/pppoe/session.c11
-rw-r--r--usr.sbin/pppoe/tag.c12
6 files changed, 6 insertions, 44 deletions
diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index 032b6c3d242..32cd0a11ada 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.23 2011/07/04 16:29:35 sthen Exp $ */
+/* $OpenBSD: client.c,v 1.24 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -28,10 +28,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -41,10 +38,7 @@
#include <net/ppp_defs.h>
#include <errno.h>
#include <string.h>
-#include <err.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <sysexits.h>
#include <stdlib.h>
#include <signal.h>
diff --git a/usr.sbin/pppoe/common.c b/usr.sbin/pppoe/common.c
index 8e3471fa1c1..7f1b6b50463 100644
--- a/usr.sbin/pppoe/common.c
+++ b/usr.sbin/pppoe/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.12 2004/05/06 20:29:04 deraadt Exp $ */
+/* $OpenBSD: common.c,v 1.13 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -28,10 +28,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -41,10 +38,8 @@
#include <net/bpf.h>
#include <errno.h>
#include <string.h>
-#include <err.h>
#include <fcntl.h>
#include <unistd.h>
-#include <sysexits.h>
#include <stdlib.h>
#include <md5.h>
diff --git a/usr.sbin/pppoe/pppoe.c b/usr.sbin/pppoe/pppoe.c
index 01eff2a4506..cb59379cee9 100644
--- a/usr.sbin/pppoe/pppoe.c
+++ b/usr.sbin/pppoe/pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppoe.c,v 1.18 2011/04/30 18:47:48 nicm Exp $ */
+/* $OpenBSD: pppoe.c,v 1.19 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
@@ -46,7 +44,6 @@
#include <pwd.h>
#include <unistd.h>
#include <sysexits.h>
-#include <stdlib.h>
#include <signal.h>
#include <ifaddrs.h>
diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c
index e46d4a228d4..410583a6db8 100644
--- a/usr.sbin/pppoe/server.c
+++ b/usr.sbin/pppoe/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.14 2011/10/11 23:41:51 yasuoka Exp $ */
+/* $OpenBSD: server.c,v 1.15 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -25,12 +25,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
#include <sys/types.h>
#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
#include <sys/param.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -38,11 +35,9 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <net/bpf.h>
-#include <net/ppp_defs.h>
#include <errno.h>
#include <string.h>
#include <err.h>
-#include <fcntl.h>
#include <unistd.h>
#include <sysexits.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppoe/session.c b/usr.sbin/pppoe/session.c
index 7c960768c7b..8b9ba2c70ad 100644
--- a/usr.sbin/pppoe/session.c
+++ b/usr.sbin/pppoe/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.4 2011/10/15 02:05:07 yasuoka Exp $ */
+/* $OpenBSD: session.c,v 1.5 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -25,24 +25,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <net/bpf.h>
-#include <errno.h>
#include <string.h>
-#include <err.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <sysexits.h>
#include <stdlib.h>
#include "pppoe.h"
diff --git a/usr.sbin/pppoe/tag.c b/usr.sbin/pppoe/tag.c
index a690fff9d33..b79a53cedfc 100644
--- a/usr.sbin/pppoe/tag.c
+++ b/usr.sbin/pppoe/tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tag.c,v 1.4 2011/07/04 16:29:35 sthen Exp $ */
+/* $OpenBSD: tag.c,v 1.5 2011/11/05 09:20:36 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -25,24 +25,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <net/bpf.h>
-#include <errno.h>
#include <string.h>
-#include <err.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sysexits.h>
#include <stdlib.h>
#include "pppoe.h"