From owner-p4-projects@FreeBSD.ORG  Thu Sep 14 13:57:49 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E412016A412; Thu, 14 Sep 2006 13:57:48 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A7F6916A407
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 13:57:48 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4625943D45
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 13:57:48 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8EDvm2g001034
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 13:57:48 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8EDvlI6001031
	for perforce@freebsd.org; Thu, 14 Sep 2006 13:57:47 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 14 Sep 2006 13:57:47 GMT
Message-Id: <200609141357.k8EDvlI6001031@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106098 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Sep 2006 13:57:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=106098

Change 106098 by piso@piso_longino on 2006/09/14 13:56:46

	Trim unnecessary headers.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#14 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#12 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#10 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#11 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#11 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#12 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#6 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#22 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#12 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#11 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#7 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#10 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#11 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#14 (text+ko) ====

@@ -113,9 +113,6 @@
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/types.h>
-#include <sys/systm.h>
 #else
 #include <sys/types.h>
 #include <stdlib.h>

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#12 (text+ko) ====

@@ -31,15 +31,8 @@
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/ctype.h>
-#include <sys/libkern.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
@@ -52,7 +45,6 @@
 #include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#10 (text+ko) ====

@@ -146,30 +146,18 @@
 #include <machine/stdarg.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/syslog.h>
 #else
 #include <stdarg.h>
-#include <sys/types.h>
-#endif
-
+#include <stdlib.h>
+#include <stdio.h>
 #include <sys/errno.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/time.h>
-
-#ifdef _KERNEL
-#include <sys/systm.h>
-#include <sys/module.h>
-#include <sys/syslog.h>
-#else 
-#include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h> 
 #endif
 
-/* BSD network include files */
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
+#include <sys/socket.h>
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
@@ -177,7 +165,6 @@
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #include <net/if.h>
-#include <netinet/in_var.h>
 #else
 #include "alias.h"
 #include "alias_local.h"

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#11 (text+ko) ====

@@ -34,29 +34,20 @@
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/ctype.h>
-#include <sys/libkern.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #endif
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/tcp.h>
+#include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#11 (text+ko) ====

@@ -72,19 +72,13 @@
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/ctype.h>
-#include <sys/libkern.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #endif
 
 #include <netinet/in_systm.h>
@@ -93,7 +87,6 @@
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#12 (text+ko) ====

@@ -50,21 +50,15 @@
 /* Includes */
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/libkern.h>
 #include <sys/ctype.h>
+#include <sys/limits.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
-#include <sys/limits.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #include <limits.h>
 #endif
 
@@ -74,7 +68,6 @@
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#6 (text+ko) ====

@@ -46,21 +46,12 @@
 #ifndef _ALIAS_LOCAL_H_
 #define	_ALIAS_LOCAL_H_
 
-#include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
 #ifdef _KERNEL
-#include <sys/param.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/condvar.h>
-#endif
-
-#ifdef _KERNEL
 /* XXX: LibAliasSetTarget() uses this constant. */
 #define	INADDR_NONE	0xffffffff
 #endif

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#22 (text+ko) ====

@@ -30,8 +30,6 @@
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/rwlock.h>
-#include <sys/proc.h>
-#include <sys/errno.h>
 #else
 #include <stdio.h>
 #include <string.h>
@@ -42,25 +40,15 @@
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
 
 #ifdef _KERNEL
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else
-#include "alias.h"
 #include "alias_local.h"
 #include "alias_mod.h"
 #endif
 
-#include <sys/types.h>
-
 /* Protocol and userland module handlers chains. */
 LIST_HEAD(handler_chain, proto_handler) handler_chain = LIST_HEAD_INITIALIZER(foo);
 #ifdef _KERNEL

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#12 (text+ko) ====

@@ -43,30 +43,21 @@
 /* Includes */
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/ctype.h>
-#include <sys/libkern.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #endif
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
-#include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#11 (text+ko) ====

@@ -41,17 +41,10 @@
 
 /* Includes */
 #ifdef _KERNEL
+#include <sys/param.h>
 #include <sys/limits.h>
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/ctype.h>
-#include <sys/libkern.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <limits.h>
@@ -59,9 +52,6 @@
 #include <stdio.h>
 #endif
 
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#7 (text+ko) ====

@@ -58,12 +58,9 @@
 #include <sys/param.h>
 #include <sys/ctype.h>
 #include <sys/libkern.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/limits.h>
 #else
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,10 +68,6 @@
 #include <string.h>
 #endif
 
-/* BSD IPV4 includes */
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#10 (text+ko) ====

@@ -32,20 +32,11 @@
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
-#include <sys/types.h>
-#include <sys/systm.h>
 #else
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 #endif
 
@@ -53,10 +44,8 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#11 (text+ko) ====

@@ -100,13 +100,9 @@
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <sys/libkern.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/types.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/syslog.h>
 #else
 #include <errno.h>
 #include <sys/types.h>
@@ -118,10 +114,8 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias_mod.h>
 #else