[master] 7d17351 Remove unused #includes, const- and statize things.

Poul-Henning Kamp phk at varnish-cache.org
Sat Jun 29 15:38:24 CEST 2013


commit 7d17351a4fc50721df0716037305a5f8ee7de394
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Jun 29 13:38:05 2013 +0000

    Remove unused #includes, const- and statize things.

diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 22af6a4..c38d63d 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -43,7 +43,6 @@
 
 #include "miniobj.h"
 #include "vas.h"
-#include "vdef.h"
 
 #include "vapi/vsl.h"
 #include "vapi/vsm.h"
@@ -83,7 +82,7 @@ VSL_Name2Tag(const char *name, int l)
 	return (n);
 }
 
-static const char *vsl_grouping[] = {
+static const char * const vsl_grouping[] = {
 	[VSL_g_raw]	= "raw",
 	[VSL_g_vxid]	= "vxid",
 	[VSL_g_request]	= "request",
diff --git a/lib/libvarnishapi/vsl_cursor.c b/lib/libvarnishapi/vsl_cursor.c
index ca1bce7..7e72e07 100644
--- a/lib/libvarnishapi/vsl_cursor.c
+++ b/lib/libvarnishapi/vsl_cursor.c
@@ -40,7 +40,6 @@
 #include <fcntl.h>
 
 #include "vas.h"
-#include "vdef.h"
 #include "miniobj.h"
 #include "vapi/vsm.h"
 #include "vsm_api.h"
@@ -212,7 +211,7 @@ vslc_vsm_skip(void *cursor, ssize_t words)
 	return (0);
 }
 
-static struct vslc_tbl vslc_vsm_tbl = {
+static const struct vslc_tbl vslc_vsm_tbl = {
 	.delete		= vslc_vsm_delete,
 	.next		= vslc_vsm_next,
 	.reset		= vslc_vsm_reset,
@@ -361,7 +360,7 @@ vslc_file_reset(void *cursor)
 	return (-1);
 }
 
-static struct vslc_tbl vslc_file_tbl = {
+static const struct vslc_tbl vslc_file_tbl = {
 	.delete		= vslc_file_delete,
 	.next		= vslc_file_next,
 	.reset		= vslc_file_reset,
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index d7252fc..608443c 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -44,7 +44,6 @@
 
 #include "miniobj.h"
 #include "vas.h"
-#include "vdef.h"
 
 #include "vapi/vsm.h"
 #include "vapi/vsm_int.h"



More information about the varnish-commit mailing list