encapsulate access to the write position of a write buffer

src/vmod_convert.c

@@ -349,7 +349,7 @@ vmod_decode(VRT_CTX, VCL_ENUM decs, const char *p, ...) {
 		WS_Reset(ctx->ws, snap);
 		return NULL;
 	}
-	buf = wb.w;
+	buf = wb_buf(&wb);
 
 	va_start(ap, p);
 	len = id_decode(dec, buf, wb_space(&wb), p, ap);
@@ -366,7 +366,7 @@ vmod_decode(VRT_CTX, VCL_ENUM decs, const char *p, ...) {
 		return null_blob;
 	}
 	wb_advance(&wb, len);
-	WS_ReleaseP(ctx->ws, wb.w);
+	WS_ReleaseP(ctx->ws, wb_buf(&wb));
 	b->priv = buf;
 	b->len = len;
 	b->free = NULL;
@@ -387,16 +387,19 @@ vmod_encode(VRT_CTX, VCL_ENUM encs, VCL_BLOB b) {
 
 	switch(enc) {
 	case IDENTITY:
-		len = id_encode(enc, wb.w, wb_space(&wb), b->priv, b->len);
+		len = id_encode(enc, wb_buf(&wb), wb_space(&wb), b->priv,
+				b->len);
 		break;
 	case BASE64:
 	case BASE64URL:
 	case BASE64URLNOPAD:
-		len = base64_encode(enc, wb.w, wb_space(&wb), b->priv, b->len);
+		len = base64_encode(enc, wb_buf(&wb), wb_space(&wb), b->priv,
+				    b->len);
 		break;
 	case HEX:
 	case HEXLC:
-		len = hex_encode(enc, wb.w, wb_space(&wb), b->priv, b->len);
+		len = hex_encode(enc, wb_buf(&wb), wb_space(&wb), b->priv,
+				 b->len);
 		break;
 	default:
 		WRONG("Illegal encoding");
@@ -463,16 +466,16 @@ vmod_transcode(VRT_CTX, VCL_ENUM decs, VCL_ENUM encs, const char *p, ...) {
 
 	switch(enc) {
 	case IDENTITY:
-		len = id_encode(enc, wb.w, wb_space(&wb), buf, len);
+		len = id_encode(enc, wb_buf(&wb), wb_space(&wb), buf, len);
 		break;
 	case HEX:
 	case HEXLC:
-		len = hex_encode(enc, wb.w, wb_space(&wb), buf, len);
+		len = hex_encode(enc, wb_buf(&wb), wb_space(&wb), buf, len);
 		break;
 	case BASE64:
 	case BASE64URL:
 	case BASE64URLNOPAD:
-		len = base64_encode(enc, wb.w, wb_space(&wb), buf, len);
+		len = base64_encode(enc, wb_buf(&wb), wb_space(&wb), buf, len);
 		break;
 	default:
 		WRONG("Illegal encoding");

src/wb.h

@@ -16,6 +16,12 @@ wb_end(struct wb_s *wb) {
 	return wb->ws->r - 1;
 }
 
+/* return the write position */
+static inline char*
+wb_buf(struct wb_s *wb) {
+	return wb->w;
+}
+
 /* return one byte less for the final zero byte */
 static inline ssize_t
 wb_space(struct wb_s *wb) {