cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1215?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by MaxF Change subject: comp-lz4: Fix types in call to LZ4_decompress_safe ...................................................................... comp-lz4: Fix types in call to LZ4_decompress_safe This is ints all around but we uselessly threw some size_t conversions in there. Change-Id: Ie550dd4df65dc4fc13c839c3e745ba96e0c5c564 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: MaxF <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1215 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg33228.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/comp-lz4.c 1 file changed, 5 insertions(+), 15 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/1215/2 diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c index a78c664..53a5b3f 100644 --- a/src/openvpn/comp-lz4.c +++ b/src/openvpn/comp-lz4.c @@ -88,19 +88,13 @@ compv2_escape_data_ifneeded(buf); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static void -do_lz4_decompress(size_t zlen_max, struct buffer *work, struct buffer *buf, +do_lz4_decompress(int zlen_max, struct buffer *work, struct buffer *buf, struct compress_context *compctx) { - int uncomp_len; ASSERT(buf_safe(work, zlen_max)); - uncomp_len = LZ4_decompress_safe((const char *)BPTR(buf), (char *)BPTR(work), (size_t)BLEN(buf), - zlen_max); + int uncomp_len = LZ4_decompress_safe((const char *)BPTR(buf), (char *)BPTR(work), BLEN(buf), + zlen_max); if (uncomp_len <= 0) { dmsg(D_COMP_ERRORS, "LZ4 decompression error: %d", uncomp_len); @@ -118,15 +112,11 @@ *buf = *work; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void lz4_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx, const struct frame *frame) { - size_t zlen_max = frame->buf.payload_size; + int zlen_max = frame->buf.payload_size; uint8_t c; /* flag indicating whether or not our peer compressed */ if (buf->len <= 0) @@ -163,7 +153,7 @@ lz4v2_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx, const struct frame *frame) { - size_t zlen_max = frame->buf.payload_size; + int zlen_max = frame->buf.payload_size; uint8_t c; /* flag indicating whether or not our peer compressed */ if (buf->len <= 0) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1215?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie550dd4df65dc4fc13c839c3e745ba96e0c5c564 Gerrit-Change-Number: 1215 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: MaxF <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-MessageType: newpatchset
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
