cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1260?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: lzo: Fix conversion warning ...................................................................... lzo: Fix conversion warning We already have an assert ensuring the value is sane, so just add the cast. Change-Id: I4a5c46f321709c83a4a921366630fb8e02834701 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1260 Message-Id: <[email protected]> URL: https://sourceforge.net/p/openvpn/mailman/message/59244106/ Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/lzo.c 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/1260/2 diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c index 8daaec0..8307b59 100644 --- a/src/openvpn/lzo.c +++ b/src/openvpn/lzo.c @@ -72,11 +72,6 @@ *header = NO_COMPRESS_BYTE; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static void lzo_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx, const struct frame *frame) @@ -107,7 +102,7 @@ } ASSERT(buf_safe(&work, zlen)); - work.len = zlen; + work.len = (int)zlen; dmsg(D_COMP, "LZO decompress %d -> %d", buf->len, work.len); compctx->pre_decompress += buf->len; @@ -126,10 +121,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - const struct compress_alg lzo_alg = { "lzo", lzo_compress_init, lzo_compress_uninit, lzo_compress, lzo_decompress }; #endif /* ENABLE_LZO */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1260?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I4a5c46f321709c83a4a921366630fb8e02834701 Gerrit-Change-Number: 1260 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
