From: Sascha Wildner <saw@online.de>
Date: Sat, 14 May 2011 22:52:28 +0000 (+0200)
Subject: Remove some duplicate includes in bin/, games/ and lib/.
X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain/cc609d8c617ddf17d7225a628ad0598fb19c203d

Remove some duplicate includes in bin/, games/ and lib/.
---

diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index db8dd09009..fa2d9ecf42 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -33,7 +33,6 @@
  * @(#) Copyright (c) 1988, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)hostname.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/bin/hostname/hostname.c,v 1.10.2.1 2001/08/01 02:40:23 obrien Exp $
- * $DragonFly: src/bin/hostname/hostname.c,v 1.14 2008/09/02 22:20:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +58,6 @@
 
 #include <netdb.h>
 #include <sys/types.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <errno.h>
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index e1751019b1..142f624f7e 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -40,7 +40,6 @@
  * @(#) Copyright (c) 1983, 1990, 1992, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)rcp.c	8.2 (Berkeley) 4/2/94
  * $FreeBSD: src/bin/rcp/rcp.c,v 1.26.2.6 2004/09/16 12:16:10 delphij Exp $
- * $DragonFly: src/bin/rcp/rcp.c,v 1.6 2005/01/07 20:30:21 dillon Exp $
  */
 
 #include <sys/cdefs.h>
@@ -66,7 +65,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "extern.h"
diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c
index c3571c02cb..2c9df85b7d 100644
--- a/games/grdc/grdc.c
+++ b/games/grdc/grdc.c
@@ -9,7 +9,6 @@
  * 03-23-04 added centering, scroll delay (cap)
  *
  * $FreeBSD: src/games/grdc/grdc.c,v 1.8.2.1 2001/10/02 11:51:49 ru Exp $
- * $DragonFly: src/games/grdc/grdc.c,v 1.6 2007/04/18 18:32:12 swildner Exp $
  */
 
 #include <err.h>
@@ -20,7 +19,6 @@
 #ifndef NONPOSIX
 #include <unistd.h>
 #endif
-#include <time.h>
 
 #define XLENGTH 58
 #define YDEPTH  7
diff --git a/games/snake/snake/snake.c b/games/snake/snake/snake.c
index c5c68f713b..5f907d03ea 100644
--- a/games/snake/snake/snake.c
+++ b/games/snake/snake/snake.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1980, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)snake.c	8.2 (Berkeley) 1/7/94
  * $FreeBSD: src/games/snake/snake/snake.c,v 1.11.2.1 2000/08/17 06:21:44 jhb Exp $
- * $DragonFly: src/games/snake/snake/snake.c,v 1.4 2006/09/03 23:47:56 pavalos Exp $
  */
 
 /*
@@ -56,7 +55,6 @@
 #include <math.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 98de8e2efa..8ad42baf5d 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -30,7 +30,6 @@
  * @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC
  * $NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $
  * $FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $
- * $DragonFly: src/lib/libc/rpc/bindresvport.c,v 1.4 2005/11/13 12:27:04 swildner Exp $
  */
 
 /*
@@ -50,8 +49,6 @@
 #include <unistd.h>
 
 #include <rpc/rpc.h>
-
-#include <string.h>
 #include "un-namespace.h"
 
 /*
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 9843eec8e9..5f36f15e94 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -31,7 +31,6 @@
  *
  * @(#)key_call.c	1.25	94/04/24 SMI
  * $FreeBSD: src/lib/libc/rpc/key_call.c,v 1.16 2006/02/27 22:10:59 deischen Exp $
- * $DragonFly: src/lib/libc/rpc/key_call.c,v 1.6 2005/11/13 12:27:04 swildner Exp $
  */
 
 /*
@@ -56,7 +55,6 @@
 #include <string.h>
 #include <netconfig.h>
 #include <sys/utsname.h>
-#include <stdlib.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/fcntl.h>
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 8d7abec0bb..ec45161962 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -60,7 +60,6 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>
-#include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_gc.c b/lib/libc_r/uthread/uthread_gc.c
index aff0e45ecf..a89c7efd90 100644
--- a/lib/libc_r/uthread/uthread_gc.c
+++ b/lib/libc_r/uthread/uthread_gc.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/uthread/uthread_gc.c,v 1.11.2.5 2002/10/22 14:44:03 fjoe Exp $
- * $DragonFly: src/lib/libc_r/uthread/uthread_gc.c,v 1.3 2005/04/28 18:16:47 joerg Exp $
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
@@ -40,7 +39,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/types.h>
 #include <sys/mman.h>
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c
index f7bfe8032a..6b09cd9502 100644
--- a/lib/libcompat/4.3/regex.c
+++ b/lib/libcompat/4.3/regex.c
@@ -34,8 +34,6 @@
  * SUCH DAMAGE.
  *
  * @(#)regex.c	5.1 (Berkeley) 3/29/92
- *
- * $DragonFly: src/lib/libcompat/4.3/regex.c,v 1.3 2008/09/30 16:57:04 swildner Exp $
  */
 
 /*
@@ -50,7 +48,6 @@
 #include <regexp.h>
 #include <string.h>
 #include <stdlib.h>
-#include <string.h>
 
 static regexp *re_regexp;
 static int re_goterr;
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 890b7d964c..cf0836a1eb 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libcompat/4.3/rexec.c,v 1.5.8.3 2000/11/22 13:36:00 ben Exp $
- * $DragonFly: src/lib/libcompat/4.3/rexec.c,v 1.6 2008/10/05 18:26:41 swildner Exp $
  *
  * @(#)rexec.c	8.1 (Berkeley) 6/4/93
  */
@@ -52,7 +51,6 @@
 #include <ctype.h>
 #include <err.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 int	rexecoptions;
 char	*getpass(), *getlogin();
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index 2b4901c97c..572b700dac 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.1.2.4 2003/04/27 00:03:36 sumikawa Exp $	*/
-/*	$DragonFly: src/lib/libipsec/pfkey_dump.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $	*/
 /*	$KAME: pfkey_dump.c,v 1.28 2001/06/27 10:46:51 sakane Exp $	*/
 
 /*
@@ -40,7 +39,6 @@
 #include <netkey/key_debug.h>
 
 #include <netinet/in.h>
-#include <netinet6/ipsec.h>
 #include <arpa/inet.h>
 
 #include <stdlib.h>
diff --git a/lib/libncurses/libncurses/termcap.c b/lib/libncurses/libncurses/termcap.c
index 1a8cbcc4a9..ee38810f15 100644
--- a/lib/libncurses/libncurses/termcap.c
+++ b/lib/libncurses/libncurses/termcap.c
@@ -59,7 +59,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include "pathnames.h"
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index 7d0a53a80b..c0e920d350 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -37,7 +37,6 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $FreeBSD: src/lib/libnetgraph/debug.c,v 1.5.2.1 2000/05/01 18:09:54 archie Exp $
- * $DragonFly: src/lib/libnetgraph/debug.c,v 1.4 2007/06/17 20:33:14 swildner Exp $
  * $Whistle: debug.c,v 1.24 1999/01/24 01:15:33 archie Exp $
  */
 
@@ -78,7 +77,6 @@
 #include <netgraph/pppoe/ng_pppoe.h>
 #include <netgraph/pptpgre/ng_pptpgre.h>
 #include <netgraph/rfc1490/ng_rfc1490.h>
-#include <netgraph/socket/ng_socket.h>
 #include <netgraph/tee/ng_tee.h>
 #include <netgraph/tty/ng_tty.h>
 #include <netgraph/vjc/ng_vjc.h>
diff --git a/lib/pam_module/pam_ssh/pam_ssh.c b/lib/pam_module/pam_ssh/pam_ssh.c
index 2ce608c347..2f69c6f4f2 100644
--- a/lib/pam_module/pam_ssh/pam_ssh.c
+++ b/lib/pam_module/pam_ssh/pam_ssh.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.45 2007/12/21 12:00:15 des Exp $
- * $DragonFly: src/lib/pam_module/pam_ssh/pam_ssh.c,v 1.2 2006/09/29 06:35:03 corecode Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +57,6 @@
 
 #include "buffer.h"
 #include "key.h"
-#include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"