Gotweb

Commit Diff

Commit:: e1f9d23174ae91964e6493328526f1c855cfedf1
From:: reyk <reyk@openbsd.org>
Date:: Sat Nov 24 17:07:28 2007 UTC
Message:: sort includes, adjust to style(9)
Actions:: Patch | Tree
commit - d8e9af71c6fd2e2b520e00e026bd7bf4784195f7
commit + e1f9d23174ae91964e6493328526f1c855cfedf1
blob - cb61f4c5271cf1e9f96d9a092915d87343d3c0dd
blob + 5b3cba8e544da1b82d6f0408c8677802bd41b6e2
--- buffer.c
+++ buffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buffer.c,v 1.7 2007/06/12 15:16:10 msf Exp $	*/
+/*	$OpenBSD: buffer.c,v 1.8 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,12 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#include <sys/param.h>
+
 #include <net/if.h>
+
 #include <errno.h>
 #include <event.h>
 #include <limits.h>
blob - 6acdeb6efc7378a4e6e5c07c02639526f51cef30
blob + 4288b01b513e5df13face35dc233b79e13568ba2
--- carp.c
+++ carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.3 2007/02/26 16:10:24 reyk Exp $ */
+/*	$OpenBSD: carp.c,v 1.4 2007/11/24 17:07:28 reyk Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -16,10 +16,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/param.h>
+
 #include <net/if.h>
 
 #include <errno.h>
blob - 2f54a08e0dfc00af981803f8696676fd38444f26
blob + 25dc21f2117d19daa07aea2d7e90932ade3cbd49
--- check_icmp.c
+++ check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.20 2007/10/09 05:38:58 pyr Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.21 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -19,14 +19,15 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/param.h>
+
+#include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp6.h>
-#include <net/if.h>
 #include <arpa/inet.h>
+
 #include <limits.h>
 #include <event.h>
 #include <errno.h>
blob - 3d050d950589c9300d47340b51f4bb4fed20822f
blob + 2f09c2543a3b4082952039857f10d3b139cd0d0f
--- check_script.c
+++ check_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_script.c,v 1.3 2007/10/13 17:50:05 deraadt Exp $	*/
+/*	$OpenBSD: check_script.c,v 1.4 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -16,11 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/param.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include <net/if.h>
blob - ae168bd02dac75d210181b74a1f3ef7d888e67c6
blob + d039a1d1335c00f7a45e644c9b1d733f951903bc
--- check_tcp.c
+++ check_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_tcp.c,v 1.29 2007/11/21 20:13:20 reyk Exp $	*/
+/*	$OpenBSD: check_tcp.c,v 1.30 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,13 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/param.h>
 
-#include <netinet/in.h>
 #include <net/if.h>
+#include <netinet/in.h>
 
 #include <limits.h>
 #include <event.h>
blob - 22aa3384a00640640e552279ca9d75d86c3360e0
blob + 97597dd84895b41fca10b46a3d823fb040bc9254
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.20 2007/11/19 15:31:36 reyk Exp $	*/
+/*	$OpenBSD: control.c,v 1.21 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -18,11 +18,12 @@
 
 #include <sys/queue.h>
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+
 #include <net/if.h>
+
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
blob - c24278196c51a4a94b00f470aa851f42aeaa6abc
blob + cb3240f52daefcb192982139b395277438688fc0
--- hce.c
+++ hce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hce.c,v 1.35 2007/11/21 09:54:39 pyr Exp $	*/
+/*	$OpenBSD: hce.c,v 1.36 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,17 +16,18 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
 #include <sys/param.h>
-#include <sys/types.h>
+#include <sys/queue.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+
+#include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <net/if.h>
+
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
blob - 1a58a10c1e9234ced7d684798b2cd1856c878396
blob + bac50e2007ad22ec221c54e257a4856f7d6fe989
--- imsg.c
+++ imsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imsg.c,v 1.8 2007/07/24 12:42:32 pyr Exp $	*/
+/*	$OpenBSD: imsg.c,v 1.9 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,12 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
-#include <sys/param.h>
+
 #include <net/if.h>
+
 #include <errno.h>
 #include <event.h>
 #include <stdlib.h>
blob - 2f2e37ce781b90a4635ded5546d76d4b110ee5ae
blob + b013a1280e1dc9e73dc8962156d61519aa290b5a
--- log.c
+++ log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.9 2007/11/20 15:54:55 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.10 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -17,16 +17,14 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/tree.h>
 
+#include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <net/if.h>
-
 #include <arpa/inet.h>
 
 #include <errno.h>
blob - 55aeef325d2ec7934655b40eec5e147dcc9f51d3
blob + b2a9f43d31c0dfd685b2d9f0818bedf409eedd9b
--- parse.y
+++ parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.94 2007/11/23 09:39:42 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.95 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -27,8 +27,9 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/queue.h>
-#include <netinet/in.h>
+
 #include <net/if.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 
blob - 0fabf35b329217f6d7a950c068a53359fb16a657
blob + 32f8c84df18bad84b97d5dd26edbaaa585286eaa
--- pfe.c
+++ pfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe.c,v 1.42 2007/11/19 15:31:36 reyk Exp $	*/
+/*	$OpenBSD: pfe.c,v 1.43 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,13 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+
 #include <net/if.h>
+
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
blob - 72a91bb26a2666aa55930ba74307bc7fb16460a0
blob + e8721c4b5ccf2a9c1018f98f8952a9b9ace7c3e1
--- pfe_filter.c
+++ pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.18 2007/09/28 13:29:56 pyr Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.19 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -20,7 +20,6 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/param.h>
 
 #include <net/if.h>
 #include <net/pfvar.h>
blob - 9333d93deeda393dad8361f32c59a0d4652bfe59
blob + 37e752d0930c8a994843ec141ccf6c6d36a44082
--- relay.c
+++ relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.69 2007/11/24 16:13:50 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.70 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -16,10 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
-#include <sys/param.h>
 #include <sys/types.h>
-#include <sys/mman.h>
+#include <sys/queue.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -27,11 +25,11 @@
 #include <sys/tree.h>
 #include <sys/hash.h>
 
+#include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <net/if.h>
 #include <arpa/inet.h>
 
 #include <errno.h>
blob - 35f389694ded45968e20b07d5811164ac3f2c12d
blob + fce5779c3d4cf31aef2d3ff2dd93760aa17034ef
--- relay_udp.c
+++ relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.1 2007/09/10 11:59:22 reyk Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.2 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -16,9 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
-#include <sys/param.h>
 #include <sys/types.h>
+#include <sys/queue.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -26,11 +25,11 @@
 #include <sys/tree.h>
 #include <sys/hash.h>
 
+#include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <net/if.h>
 #include <arpa/inet.h>
 
 #include <errno.h>
blob - 9e05a2d44cb745928d9026a4d6cecc96e475341d
blob + 1bbc75a70199942c883a0b0762e2fa8ae74f8334
--- relayd.c
+++ relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.58 2007/11/24 16:13:50 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.59 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -19,11 +19,12 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/param.h>
 #include <sys/wait.h>
+
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
blob - 9db92cc07d3a0bd65b0701ced916d4b43a6a13f6
blob + 889857383af31d5b4162e04903fbe508e4176050
--- ssl.c
+++ ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.10 2007/09/28 13:29:56 pyr Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.11 2007/11/24 17:07:28 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,12 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/param.h>
-#include <netinet/in.h>
+
 #include <net/if.h>
+#include <netinet/in.h>
+
 #include <limits.h>
 #include <event.h>
 #include <fcntl.h>
blob - 2e7003a6ee0b91432d29faf25fcc3c5da49cae70
blob + ed01d55db5ad23b7c7287386d645927e59124f39
--- ssl_privsep.c
+++ ssl_privsep.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssl_privsep.c,v 1.5 2007/11/23 09:22:40 sthen Exp $    */
+/*      $OpenBSD: ssl_privsep.c,v 1.6 2007/11/24 17:07:28 reyk Exp $    */
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -64,6 +64,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
+
 #include <openssl/err.h>
 #include <openssl/bio.h>
 #include <openssl/objects.h>