Attention is currently required from: plaisthos. Hello plaisthos,
I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/642?usp=email to review the following change. Change subject: LZO: do not use lzoutils.h macros ...................................................................... LZO: do not use lzoutils.h macros Instead of lzo_{free,malloc} we can just use the free and malloc as the lzoutils.h header itself suggests. Change-Id: I32ee28fde5d38d736f753c782d88a81de7fe2980 Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com> --- M config.h.cmake.in M configure.ac M src/openvpn/lzo.c M src/openvpn/lzo.h 4 files changed, 4 insertions(+), 21 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/642/1 diff --git a/config.h.cmake.in b/config.h.cmake.in index 2cdfdcc..effca2a 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -184,9 +184,6 @@ /* Define to 1 if you have the <lzo1x.h> header file. */ #define HAVE_LZO1X_H 1 -/* Define to 1 if you have the <lzoutil.h> header file. */ -#define HAVE_LZOUTIL_H 1 - /* Define to 1 if you have the `mlockall' function. */ #cmakedefine HAVE_MLOCKALL diff --git a/configure.ac b/configure.ac index d834f30..bb87c59 100644 --- a/configure.ac +++ b/configure.ac @@ -1174,15 +1174,6 @@ saved_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${LZO_CFLAGS}" AC_CHECK_HEADERS( - [lzo/lzoutil.h], - , - [AC_CHECK_HEADERS( - [lzoutil.h], - , - [AC_MSG_ERROR([lzoutil.h is missing])] - )] - ) - AC_CHECK_HEADERS( [lzo/lzo1x.h], , [AC_CHECK_HEADERS( diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c index b313284..bab2d78 100644 --- a/src/openvpn/lzo.c +++ b/src/openvpn/lzo.c @@ -107,14 +107,14 @@ { msg(M_FATAL, "Cannot initialize LZO compression library (lzo_init() returns %d)", lzo_status); } - compctx->wu.lzo.wmem = (lzo_voidp) lzo_malloc(compctx->wu.lzo.wmem_size); + compctx->wu.lzo.wmem = (lzo_voidp) malloc(compctx->wu.lzo.wmem_size); check_malloc_return(compctx->wu.lzo.wmem); } static void lzo_compress_uninit(struct compress_context *compctx) { - lzo_free(compctx->wu.lzo.wmem); + free(compctx->wu.lzo.wmem); compctx->wu.lzo.wmem = NULL; } diff --git a/src/openvpn/lzo.h b/src/openvpn/lzo.h index e951b49..62d73a1 100644 --- a/src/openvpn/lzo.h +++ b/src/openvpn/lzo.h @@ -40,16 +40,11 @@ #if defined(HAVE_LZO_CONF_H) /* The lzo.h magic gets confused and still wants * to include lzo/lzoconf.h even if our include paths - * are setup to include the paths without lzo/ include lzoconf.h to - * avoid it being include by lzoutil.h */ + * are setup to include the paths without lzo/ + */ #include <lzodefs.h> #include <lzoconf.h> #endif -#if defined(HAVE_LZO_LZOUTIL_H) -#include <lzo/lzoutil.h> -#elif defined(HAVE_LZOUTIL_H) -#include <lzoutil.h> -#endif #if defined(HAVE_LZO_LZO1X_H) #include <lzo/lzo1x.h> #elif defined(HAVE_LZO1X_H) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/642?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: I32ee28fde5d38d736f753c782d88a81de7fe2980 Gerrit-Change-Number: 642 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld <fr...@lichtenheld.com> Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-Attention: plaisthos <arne-open...@rfc2549.org> Gerrit-MessageType: newchange
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel