r5659 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-12-20 13:24:33 +0100 (Mon, 20 Dec 2010)
New Revision: 5659

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
Log:
Eliminate now pointless static wrapper function.



Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2010-12-20 10:12:42 UTC (rev 5658)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2010-12-20 12:24:33 UTC (rev 5659)
@@ -197,18 +197,6 @@
 }
 
 /*--------------------------------------------------------------------
- * XXX: Optimize the single element case ?
- */
-
-static char *
-vrt_assemble_string(const struct http *hp, const char *h, const char *p,
-    va_list ap)
-{
-
-	return (VRT_String(hp->ws, h, p, ap));
-}
-
-/*--------------------------------------------------------------------
  * Build a string on the worker threads workspace
  */
 
@@ -241,7 +229,7 @@
 	if (p == NULL) {
 		http_Unset(hp, hdr);
 	} else {
-		b = vrt_assemble_string(hp, hdr + 1, p, ap);
+		b = VRT_String(hp->ws, hdr + 1, p, ap);
 		if (b == NULL) {
 			WSP(sp, SLT_LostHeader, "%s", hdr + 1);
 		} else {
@@ -412,7 +400,7 @@
 	char *b;
 
 	va_start(ap, str);
-	b = vrt_assemble_string(sp->http, "PANIC: ", str, ap);
+	b = VRT_String(sp->http->ws, "PANIC: ", str, ap);
 	va_end(ap);
 	vas_fail("VCL", "", 0, b, 0, 2);
 }