[master] d647764 Eliminate a single-use macro

[Poul-Henning Kamp]

commit d647764b9c1657e329ab632d5e81f1dd5e127b33
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Feb 19 07:51:30 2012 +0000

    Eliminate a single-use macro

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index daa01f4..d441fca 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -935,9 +935,6 @@ void WSL_Flush(struct vsl_log *, int overflow);
 #define WSP(sess, tag, ...)					\
 	WSL((sess)->wrk->vsl, tag, (sess)->vsl_id, __VA_ARGS__)
 
-#define WSPR(sess, tag, txt)					\
-	WSLR((sess)->wrk->vsl, tag, (sess)->vsl_id, txt)
-
 #define INCOMPL() do {							\
 	VSL(SLT_Debug, 0, "INCOMPLETE AT: %s(%d)", __func__, __LINE__); \
 	fprintf(stderr,							\
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index de71ada..71533ef 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -677,7 +677,7 @@ http_DissectRequest(const struct sess *sp)
 	retval = http_splitline(hp, htc,
 	    HTTP_HDR_REQ, HTTP_HDR_URL, HTTP_HDR_PROTO);
 	if (retval != 0) {
-		WSPR(sp, SLT_HttpGarbage, htc->rxbuf);
+		WSLR(sp->req->vsl, SLT_HttpGarbage, -1, htc->rxbuf);
 		return (retval);
 	}
 	http_ProtoVer(hp);