[master] 17267bc63 vmod_blob: Remove needless workspace snapshot

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Aug 31 18:41:09 UTC 2020


commit 17267bc63a4c241703720b73ada5c3c153e5ac73
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jun 2 16:10:58 2020 +0200

    vmod_blob: Remove needless workspace snapshot
    
    It may predate the use of a workspace reservation, and is ultimately
    redundant.
    
    Originally from #3320.

diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index 84d3675c0..0881798a3 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -369,7 +369,6 @@ encode(VRT_CTX, enum encoding enc, enum case_e kase, VCL_BLOB b)
 {
 	ssize_t len;
 	char *buf;
-	uintptr_t snap;
 	unsigned space;
 
 	AENC(enc);
@@ -378,7 +377,6 @@ encode(VRT_CTX, enum encoding enc, enum case_e kase, VCL_BLOB b)
 		return (NULL);
 
 	CHECK_OBJ_NOTNULL(ctx->ws, WS_MAGIC);
-	snap = WS_Snapshot(ctx->ws);
 	space = WS_ReserveAll(ctx->ws);
 	buf = WS_Front(ctx->ws);
 
@@ -387,12 +385,10 @@ encode(VRT_CTX, enum encoding enc, enum case_e kase, VCL_BLOB b)
 	if (len == -1) {
 		ERRNOMEM(ctx, "cannot encode");
 		WS_Release(ctx->ws, 0);
-		WS_Reset(ctx->ws, snap);
 		return (NULL);
 	}
 	if (len == 0) {
 		WS_Release(ctx->ws, 0);
-		WS_Reset(ctx->ws, snap);
 		return ("");
 	}
 	buf[len] = '\0';


More information about the varnish-commit mailing list