[master] 4dfedb0 Remove unused detrius. Constify

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


commit 4dfedb014b98b31fb6bde0ccfe310c33ed5b04a7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Jun 29 13:40:53 2013 +0000

    Remove unused detrius. Constify

diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index 989effd..e5a7506 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -36,11 +36,7 @@
 
 #define VSL_FILE_ID			"VSL"
 
-struct vslc_shmptr {
-	uint32_t	*ptr;
-	unsigned	priv;
-};
-
+/*lint -esym(534, vsl_diag) */
 int vsl_diag(struct VSL_data *vsl, const char *fmt, ...)
     __printflike(2, 3);
 int vsl_skip(struct VSL_cursor *c, ssize_t words);
@@ -49,7 +45,6 @@ typedef void vslc_delete_f(void *);
 typedef int vslc_next_f(void *);
 typedef int vslc_reset_f(void *);
 typedef int vslc_skip_f(void *, ssize_t words);
-typedef int vslc_ref_f(void *, struct vslc_shmptr *ptr);
 typedef int vslc_check_f(const void *, const struct VSLC_ptr *ptr);
 
 struct vslc_tbl {
@@ -105,4 +100,4 @@ struct vslq_query;
 struct vslq_query *vslq_newquery(struct VSL_data *vsl,
     enum VSL_grouping_e grouping, const char *query);
 void vslq_deletequery(struct vslq_query **pquery);
-int vslq_runquery(struct vslq_query *query, struct VSL_transaction *ptrans[]);
+int vslq_runquery(const struct vslq_query *query, struct VSL_transaction * const ptrans[]);
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 9685486..436d7c9 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -89,7 +89,7 @@ vslq_deletequery(struct vslq_query **pquery)
 }
 
 int
-vslq_runquery(struct vslq_query *query, struct VSL_transaction *ptrans[])
+vslq_runquery(const struct vslq_query *query, struct VSL_transaction * const ptrans[])
 {
 	struct VSL_transaction *t;
 	struct VSL_cursor *c;



More information about the varnish-commit mailing list