[master] c4e830a More #include untangling
Poul-Henning Kamp
phk at FreeBSD.org
Wed Mar 4 14:48:35 CET 2015
commit c4e830a07f7cc92fb86e037668ee40e4a93193b9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Mar 4 13:42:20 2015 +0000
More #include untangling
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 6505704..db721fe 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -33,18 +33,20 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <stdio.h>
#include <errno.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "miniobj.h"
+#include "vdef.h"
#include "vas.h"
+#include "miniobj.h"
+#include "vqueue.h"
#include "vapi/vsc.h"
#include "vapi/vsm.h"
-#include "vqueue.h"
+
#include "vsm_api.h"
enum {
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 5e12f0f..8bd6033 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -41,15 +41,19 @@
#include <string.h>
#include <unistd.h>
-#include "miniobj.h"
-#include "vas.h"
#include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
-#include "vapi/vsm.h"
-#include "vapi/vsl.h"
#include "vbm.h"
#include "vmb.h"
+#include "vqueue.h"
+#include "vre.h"
#include "vsb.h"
+
+#include "vapi/vsm.h"
+#include "vapi/vsl.h"
+
#include "vsl_api.h"
#include "vsm_api.h"
diff --git a/lib/libvarnishapi/vsl2rst.c b/lib/libvarnishapi/vsl2rst.c
index c049fab..f443a91 100644
--- a/lib/libvarnishapi/vsl2rst.c
+++ b/lib/libvarnishapi/vsl2rst.c
@@ -29,8 +29,8 @@
#include "config.h"
-#include <stdio.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index f3bd213..584bc8c 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -29,11 +29,6 @@
*
*/
-#include "vdef.h"
-#include "vqueue.h"
-#include "vre.h"
-#include "vapi/vsm.h"
-
#define VSL_FILE_ID "VSL"
/*lint -esym(534, vsl_diag) */
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index a37a8ce..229d9fc 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -36,21 +36,26 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <math.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <limits.h>
-#include "miniobj.h"
+#include "vdef.h"
#include "vas.h"
+#include "miniobj.h"
-#include "vapi/vsl.h"
-#include "vapi/vsm.h"
#include "vbm.h"
#include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
+
+#include "vapi/vsl.h"
+#include "vapi/vsm.h"
+
#include "vsl_api.h"
#include "vsm_api.h"
diff --git a/lib/libvarnishapi/vsl_cursor.c b/lib/libvarnishapi/vsl_cursor.c
index 22d68bf..ba6e7d2 100644
--- a/lib/libvarnishapi/vsl_cursor.c
+++ b/lib/libvarnishapi/vsl_cursor.c
@@ -29,22 +29,29 @@
*
*/
-#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
#include <stdint.h>
#include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "vdef.h"
#include "vas.h"
#include "miniobj.h"
-#include "vsm_api.h"
-#include "vapi/vsl.h"
+
+#include "vqueue.h"
+#include "vre.h"
#include "vsl_priv.h"
+
+#include "vapi/vsl.h"
+#include "vapi/vsm.h"
+
#include "vsl_api.h"
+#include "vsm_api.h"
struct vslc_vsm {
unsigned magic;
diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index 7f393b3..5189081 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -29,19 +29,23 @@
*/
#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
#include <stdarg.h>
#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "vdef.h"
#include "vas.h"
#include "miniobj.h"
+
#include "vqueue.h"
-#include "vtree.h"
+#include "vre.h"
#include "vtim.h"
+#include "vtree.h"
#include "vapi/vsl.h"
+
#include "vsl_api.h"
#define VTX_CACHE 10
diff --git a/lib/libvarnishapi/vsl_glob_test.c b/lib/libvarnishapi/vsl_glob_test.c
index 6aac16a..bc5eee1 100644
--- a/lib/libvarnishapi/vsl_glob_test.c
+++ b/lib/libvarnishapi/vsl_glob_test.c
@@ -28,8 +28,8 @@
* Test what VSL_Name2Tag and VSL_Glob2Tags produces
*/
-#include <stdio.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 7b4d279..435a351 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -28,22 +28,26 @@
*
*/
-#include <errno.h>
#include <ctype.h>
+#include <errno.h>
#include <math.h>
#include <stdint.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include "miniobj.h"
-#include "vas.h"
#include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
+
#include "vbm.h"
#include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
#include "vsb.h"
#include "vapi/vsl.h"
+
#include "vsl_api.h"
#include "vxp.h"
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index ebc742e..e805b1f 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -43,15 +43,17 @@
#include <string.h>
#include <unistd.h>
-#include "miniobj.h"
-#include "vas.h"
#include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
-#include "vapi/vsm.h"
-#include "vsm_priv.h"
-#include "vtim.h"
#include "vin.h"
#include "vsb.h"
+#include "vsm_priv.h"
+#include "vtim.h"
+
+#include "vapi/vsm.h"
+
#include "vsm_api.h"
#ifndef MAP_HASSEMAPHORE
diff --git a/lib/libvarnishapi/vsm_api.h b/lib/libvarnishapi/vsm_api.h
index ce4f954..7df8c88 100644
--- a/lib/libvarnishapi/vsm_api.h
+++ b/lib/libvarnishapi/vsm_api.h
@@ -28,8 +28,6 @@
*
*/
-#include <vdef.h>
-
struct vsc;
struct vsb;
diff --git a/lib/libvarnishapi/vxp.c b/lib/libvarnishapi/vxp.c
index e877cae..2e21b55 100644
--- a/lib/libvarnishapi/vxp.c
+++ b/lib/libvarnishapi/vxp.c
@@ -31,14 +31,15 @@
#include "config.h"
#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
-#include "vas.h"
#include "vdef.h"
+#include "vas.h"
#include "miniobj.h"
+
#include "vqueue.h"
#include "vre.h"
#include "vsb.h"
diff --git a/lib/libvarnishapi/vxp_lexer.c b/lib/libvarnishapi/vxp_lexer.c
index 59e6869..c57318c 100644
--- a/lib/libvarnishapi/vxp_lexer.c
+++ b/lib/libvarnishapi/vxp_lexer.c
@@ -31,16 +31,17 @@
#include "config.h"
#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include "vdef.h"
-#include "vsb.h"
#include "vas.h"
#include "vqueue.h"
+
#include "vre.h"
+#include "vsb.h"
#include "vxp.h"
diff --git a/lib/libvarnishapi/vxp_parse.c b/lib/libvarnishapi/vxp_parse.c
index 8e9632d..410fccb 100644
--- a/lib/libvarnishapi/vxp_parse.c
+++ b/lib/libvarnishapi/vxp_parse.c
@@ -33,20 +33,24 @@
#include <ctype.h>
#include <errno.h>
#include <math.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdint.h>
-#include "miniobj.h"
-#include "vas.h"
#include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
+
#include "vbm.h"
#include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
#include "vsb.h"
+
#include "vapi/vsl.h"
-#include "vsl_api.h"
+#include "vsl_api.h"
#include "vxp.h"
static void vxp_expr_or(struct vxp *vxp, struct vex **pvex);
diff --git a/lib/libvarnishapi/vxp_test.c b/lib/libvarnishapi/vxp_test.c
index a4abf4a..970cb26 100644
--- a/lib/libvarnishapi/vxp_test.c
+++ b/lib/libvarnishapi/vxp_test.c
@@ -26,16 +26,18 @@
* SUCH DAMAGE.
*/
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "vxp.h"
+#include "miniobj.h"
#include "vas.h"
+
#include "vsb.h"
-#include "miniobj.h"
+
+#include "vxp.h"
static void
usage(void)
More information about the varnish-commit
mailing list