[master] cbda52a We need VSM_Alloc() for test c00083 for now.

Poul-Henning Kamp phk at FreeBSD.org
Tue May 23 14:56:05 CEST 2017


commit cbda52aea7bc40a642d03e1fd75f68aaf57fb6cc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 23 12:47:07 2017 +0000

    We need VSM_Alloc() for test c00083 for now.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 6711c89..5256c3f 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -977,6 +977,8 @@ void SES_Set_String_Attr(struct sess *sp, enum sess_attr a, const char *src);
 const char *SES_Get_String_Attr(const struct sess *sp, enum sess_attr a);
 
 /* cache_shmlog.c */
+void *VSM_Alloc(unsigned size, const char *class, const char *type,
+    const char *ident);
 void VSM_Free(void *ptr);
 #ifdef VSL_ENDMARKER
 void VSLv(enum VSL_tag_e tag, uint32_t vxid, const char *fmt, va_list va);
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 8ff321d..5429a14 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -55,9 +55,6 @@ static ssize_t			vsl_segsize;
 
 struct VSC_main *VSC_C_main;
 
-static void *VSM_Alloc(unsigned size, const char *class, const char *type,
-    const char *ident);
-
 static void
 vsl_sanity(const struct vsl_log *vsl)
 {
@@ -569,7 +566,7 @@ VSM_Init(void)
 
 /*--------------------------------------------------------------------*/
 
-static void *
+void *
 VSM_Alloc(unsigned size, const char *class, const char *type,
     const char *ident)
 {



More information about the varnish-commit mailing list