Sort and group includes.

author: jsing <> 2014-05-05 16:19:23 +0000
committer: jsing <> 2014-05-05 16:19:23 +0000
commit: 8fa46cda04d0da87e6504a0b57f0646186f9e2a4 (patch)
tree: e81dee7c9ad361d004d639d154384ead0e67cff5
parent: 82890565c5863589f46be0aea51007a0a2df9dfe (diff)
download: openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.tar.gz
openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.tar.bz2
openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.zip
4 files changed, 22 insertions, 20 deletions
diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index 740686c957..65238299f2 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -61,9 +61,11 @@
 */
 #include <stdio.h>
-#include "cryptlib.h"
 #include <openssl/bio.h>
+#include "cryptlib.h"
 #define TRUNCATE
 #define DUMP_WIDTH      16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 7da33d36b2..a9c4408a09 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -57,22 +57,21 @@
 */
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <errno.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <sys/ioctl.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include <openssl/bio.h>
 #include <openssl/dso.h>
+#include "cryptlib.h"
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #ifdef SO_MAXCONN
diff --git a/src/lib/libssl/src/crypto/bio/b_dump.c b/src/lib/libssl/src/crypto/bio/b_dump.c
index 740686c957..65238299f2 100644
--- a/src/lib/libssl/src/crypto/bio/b_dump.c
+++ b/src/lib/libssl/src/crypto/bio/b_dump.c
@@ -61,9 +61,11 @@
 */
 #include <stdio.h>
-#include "cryptlib.h"
 #include <openssl/bio.h>
+#include "cryptlib.h"
 #define TRUNCATE
 #define DUMP_WIDTH      16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 7da33d36b2..a9c4408a09 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -57,22 +57,21 @@
 */
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <errno.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <sys/ioctl.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include <openssl/bio.h>
 #include <openssl/dso.h>
+#include "cryptlib.h"
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #ifdef SO_MAXCONN
author	jsing <>	2014-05-05 16:19:23 +0000
committer	jsing <>	2014-05-05 16:19:23 +0000
commit	8fa46cda04d0da87e6504a0b57f0646186f9e2a4 (patch)
tree	e81dee7c9ad361d004d639d154384ead0e67cff5
parent	82890565c5863589f46be0aea51007a0a2df9dfe (diff)
download	openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.tar.gz openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.tar.bz2 openbsd-8fa46cda04d0da87e6504a0b57f0646186f9e2a4.zip

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 740686c957..65238299f2 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c
@@ -61,9 +61,11 @@
61	*/	61	*/
62		62
63	#include <stdio.h>	63	#include <stdio.h>
64	#include "cryptlib.h"	64
65	#include <openssl/bio.h>	65	#include <openssl/bio.h>
66		66
		67	#include "cryptlib.h"
		68
67	#define TRUNCATE	69	#define TRUNCATE
68	#define DUMP_WIDTH 16	70	#define DUMP_WIDTH 16
69	#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))	71	#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))


diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 7da33d36b2..a9c4408a09 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c
@@ -57,22 +57,21 @@
57	*/	57	*/
58		58
59	#include <sys/ioctl.h>	59	#include <sys/ioctl.h>
		60	#include <sys/socket.h>
		61
		62	#include <netinet/in.h>
60		63
		64	#include <errno.h>
		65	#include <netdb.h>
61	#include <stdio.h>	66	#include <stdio.h>
62	#include <stdlib.h>	67	#include <stdlib.h>
63	#include <unistd.h>	68	#include <unistd.h>
64	#include <errno.h>
65	#include "cryptlib.h"
66	#include <openssl/bio.h>
67	#include <sys/ioctl.h>
68
69	#include <netdb.h>
70	#include <sys/socket.h>
71	#include <netinet/in.h>
72
73		69
		70	#include <openssl/bio.h>
74	#include <openssl/dso.h>	71	#include <openssl/dso.h>
75		72
		73	#include "cryptlib.h"
		74
76	#define SOCKET_PROTOCOL IPPROTO_TCP	75	#define SOCKET_PROTOCOL IPPROTO_TCP
77		76
78	#ifdef SO_MAXCONN	77	#ifdef SO_MAXCONN


diff --git a/src/lib/libssl/src/crypto/bio/b_dump.c b/src/lib/libssl/src/crypto/bio/b_dump.c index 740686c957..65238299f2 100644 --- a/src/lib/libssl/src/crypto/bio/b_dump.c +++ b/src/lib/libssl/src/crypto/bio/b_dump.c
@@ -61,9 +61,11 @@
61	*/	61	*/
62		62
63	#include <stdio.h>	63	#include <stdio.h>
64	#include "cryptlib.h"	64
65	#include <openssl/bio.h>	65	#include <openssl/bio.h>
66		66
		67	#include "cryptlib.h"
		68
67	#define TRUNCATE	69	#define TRUNCATE
68	#define DUMP_WIDTH 16	70	#define DUMP_WIDTH 16
69	#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))	71	#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))


diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index 7da33d36b2..a9c4408a09 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -57,22 +57,21 @@
57	*/	57	*/
58		58
59	#include <sys/ioctl.h>	59	#include <sys/ioctl.h>
		60	#include <sys/socket.h>
		61
		62	#include <netinet/in.h>
60		63
		64	#include <errno.h>
		65	#include <netdb.h>
61	#include <stdio.h>	66	#include <stdio.h>
62	#include <stdlib.h>	67	#include <stdlib.h>
63	#include <unistd.h>	68	#include <unistd.h>
64	#include <errno.h>
65	#include "cryptlib.h"
66	#include <openssl/bio.h>
67	#include <sys/ioctl.h>
68
69	#include <netdb.h>
70	#include <sys/socket.h>
71	#include <netinet/in.h>
72
73		69
		70	#include <openssl/bio.h>
74	#include <openssl/dso.h>	71	#include <openssl/dso.h>
75		72
		73	#include "cryptlib.h"
		74
76	#define SOCKET_PROTOCOL IPPROTO_TCP	75	#define SOCKET_PROTOCOL IPPROTO_TCP
77		76
78	#ifdef SO_MAXCONN	77	#ifdef SO_MAXCONN