upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

LZO: do not use lzoutils.h macros

Browse source 
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 <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Message-Id: <20240604211708.32315-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28705.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit d601237976)
This commit is contained in:
Frank Lichtenheld 2024-06-04 23:17:08 +02:00 committed by Gert Doering
parent 2f2ff18656
commit 1ae753e424
4 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.h.cmake.in
View file

@ -181,9 +181,6 @@ don't. */
/* 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

9
configure.ac
View file

@ -1169,15 +1169,6 @@ fi
if test "${have_lzo}" = "yes"; then
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],
,

4
src/openvpn/lzo.c
View file

@ -107,14 +107,14 @@ lzo_compress_init(struct compress_context *compctx)
{
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;
}

9
src/openvpn/lzo.h
View file

@ -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)