[master] 7bfd13b Polish

[Federico G. Schwindt]

commit 7bfd13b4bf5f1d1307495705278e643b00410d7b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 28 17:46:39 2017 +0100

    Polish

diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 6cc635d..85c8ce0 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -764,36 +764,34 @@ VRT_BODY_L(resp)
 
 /*--------------------------------------------------------------------*/
 
-const char *
-VRT_r_req_hash(VRT_CTX)
+static const char *
+vrt_hash(VRT_CTX, uint8_t *digest)
 {
 	char *p;
 	int i;
 
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(ctx->req, REQ_MAGIC);
 	p = WS_Alloc(ctx->ws, SHA256_LEN * 2 + 1);
 	if (p == NULL)
 		return (NULL);
 	for (i = 0; i < SHA256_LEN; i++)
-		sprintf(&p[i * 2], "%02x", ctx->req->digest[i]);
+		sprintf(&p[i * 2], "%02x", digest[i]);
 	return (p);
 }
 
 const char *
-VRT_r_bereq_hash(VRT_CTX)
+VRT_r_req_hash(VRT_CTX)
 {
-	char *p;
-	int i;
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(ctx->req, REQ_MAGIC);
+	return (vrt_hash(ctx, ctx->req->digest));
+}
 
+const char *
+VRT_r_bereq_hash(VRT_CTX)
+{
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
-	p = WS_Alloc(ctx->ws, SHA256_LEN * 2 + 1);
-	if (p == NULL)
-		return (NULL);
-	for (i = 0; i < SHA256_LEN; i++)
-		sprintf(&p[i * 2], "%02x", ctx->bo->digest[i]);
-	return (p);
+	return (vrt_hash(ctx, ctx->bo->digest));
 }
 
 /*--------------------------------------------------------------------*/