[master] 2fd2a78 Move Tadd() to the only source file which uses it

Poul-Henning Kamp phk at FreeBSD.org
Sun Sep 28 19:53:46 CEST 2014


commit 2fd2a78dd21c303602e7d01a5f8d6763bb2aa5bf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Sep 28 16:25:52 2014 +0000

    Move Tadd() to the only source file which uses it

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 238baa1..f3a05be 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -1206,20 +1206,6 @@ Tlen(const txt t)
 	return ((unsigned)(t.e - t.b));
 }
 
-static inline void
-Tadd(txt *t, const char *p, int l)
-{
-	Tcheck(*t);
-
-	if (l <= 0) {
-	} if (t->b + l < t->e) {
-		memcpy(t->b, p, l);
-		t->b += l;
-	} else {
-		t->b = t->e;
-	}
-}
-
 /*
  * We want to cache the most recent timestamp in wrk->lastused to avoid
  * extra timestamps in cache_pool.c.  Hide this detail with a macro
diff --git a/bin/varnishd/cache/cache_vrt_re.c b/bin/varnishd/cache/cache_vrt_re.c
index d198d1f..2727ba7 100644
--- a/bin/varnishd/cache/cache_vrt_re.c
+++ b/bin/varnishd/cache/cache_vrt_re.c
@@ -38,6 +38,20 @@
 #include "vre.h"
 #include "vrt.h"
 
+static void
+Tadd(txt *t, const char *p, int l)
+{
+	Tcheck(*t);
+
+	if (l <= 0) {
+	} if (t->b + l < t->e) {
+		memcpy(t->b, p, l);
+		t->b += l;
+	} else {
+		t->b = t->e;
+	}
+}
+
 void
 VRT_re_init(void **rep, const char *re)
 {



More information about the varnish-commit mailing list