[master] 9871dd7 Change VRT_CacheReqBody() signature
Federico G. Schwindt
fgsch at lodoss.net
Tue Feb 16 21:28:18 CET 2016
commit 9871dd7ebd64b82d929097683c0cab381687bc81
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Tue Feb 16 20:07:27 2016 +0000
Change VRT_CacheReqBody() signature
OK'd by phk at .
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 09441e0..50a7232 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -460,14 +460,8 @@ VRT_ban_string(VRT_CTX, const char *str)
VAV_Free(av);
}
-/*--------------------------------------------------------------------
- *
- * XXX this really should be ssize_t VRT_CacheReqBody(VRT_CTX, size_t)
- * - change with next VRT major bump
- */
-
-int
-VRT_CacheReqBody(VRT_CTX, long long maxsize)
+ssize_t
+VRT_CacheReqBody(VRT_CTX, size_t maxsize)
{
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/include/vrt.h b/include/vrt.h
index 1f19cd4..c38fc59 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -31,6 +31,8 @@
* NB: When this file is changed, lib/libvcc/generate.py *MUST* be rerun.
*/
+#include <sys/types.h>
+
/***********************************************************************
* Major and minor VRT API versions.
*
@@ -38,8 +40,8 @@
* Whenever something is deleted or changed in a way which is not
* binary/load-time compatible, increment MAJOR version
*
- * changes to consider with next VRT_MAJOR_VERSION bump:
- * - cache_vrt.c: -> ssize_t VRT_CacheReqBody(VRT_CTX, size_t)
+ * Bump VRT_MAJOR_VERSION due to:
+ * - VRT_CacheReqBody changed signature
*
*/
@@ -242,7 +244,7 @@ void VRT_acl_log(VRT_CTX, const char *msg);
/* req related */
-int VRT_CacheReqBody(VRT_CTX, long long maxsize);
+ssize_t VRT_CacheReqBody(VRT_CTX, size_t maxsize);
/* Regexp related */
void VRT_re_init(void **, const char *);
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index c4690b4..3afc937 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -228,15 +228,13 @@ vmod_timestamp(VRT_CTX, VCL_STRING label)
VCL_VOID __match_proto__(td_std_cache_req_body)
vmod_cache_req_body(VRT_CTX, VCL_BYTES size)
{
- int result;
- ssize_t ss;
+ ssize_t result;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
if (size < 0)
size = 0;
- ss = (ssize_t)size;
- result = VRT_CacheReqBody(ctx, ss);
- VSLb(ctx->vsl, SLT_Debug, "VRT_CacheReqBody(%zd): %d", ss, result);
+ result = VRT_CacheReqBody(ctx, (size_t)size);
+ VSLb(ctx->vsl, SLT_Debug, "VRT_CacheReqBody(%zd): %zd", (size_t)size, result);
}
VCL_STRING __match_proto__(td_std_strstr)
More information about the varnish-commit
mailing list