From: "cron2 (Code Review)" Date: Thu, 6 Jun 2024 11:33:45 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., gianmarco@...2726..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="NiGu1CZ/TG4="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: LZO: do not use lzoutils.h macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: its_Giaan , flichtenheld Cc: plaisthos , openvpn-devel --NiGu1CZ/TG4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/64= 2?usp=3Demail ) 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 Acked-by: Arne Schwabe Message-Id: <20240604211708.32315-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 705.html Signed-off-by: Gert Doering --- 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(-) 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 header file. */ #define HAVE_LZO1X_H 1 -/* Define to 1 if you have the 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 965ed1a..2e5ab6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,15 +1161,6 @@ saved_CFLAGS=3D"${CFLAGS}" CFLAGS=3D"${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 =3D (lzo_voidp) lzo_malloc(compctx->wu.lzo.wmem_s= ize); + compctx->wu.lzo.wmem =3D (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 =3D 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 #include #endif -#if defined(HAVE_LZO_LZOUTIL_H) -#include -#elif defined(HAVE_LZOUTIL_H) -#include -#endif #if defined(HAVE_LZO_LZO1X_H) #include #elif defined(HAVE_LZO1X_H) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/642?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I32ee28fde5d38d736f753c782d88a81de7fe2980 Gerrit-Change-Number: 642 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --NiGu1CZ/TG4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

LZO: do not use lzoutils.h macros

Inste= ad of lzo_{free,malloc} we can just use the
free and malloc as the lzout= ils.h header itself
suggests.

Change-Id: I32ee28fde5d38d736f753c7= 82d88a81de7fe2980
Signed-off-by: Frank Lichtenheld <frank@...2641...&= gt;
Acked-by: Arne Schwabe <arne-openvpn@...1227...>
Message-Id= : <20240604211708.32315-1-gert@...1296...>
URL: https://www.mail-a= rchive.com/openvpn-devel@lists.sourceforge.net/msg28705.html
Signed-off-= by: Gert Doering <gert@...1296...>
---
M config.h.cmake.in
M= configure.ac
M src/openvpn/lzo.c
M src/openvpn/lzo.h
4 files chan= ged, 4 insertions(+), 21 deletions(-)

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
- [lzo/lzoutil.h],
- ,
- [AC_CHECK_HEADERS(
- [lzoutil.h],
- ,
- [AC_MS= G_ERROR([lzoutil.h is missing])]
- )]
- )

- AC_CHECK_HEADERS(=
[lzo/lzo1x.h],
,
[AC_CHE= CK_HEADERS(
diff --git a/src/openvpn/lzo.c b/src/openvpn/lz= o.c
index b313284..bab2d78 100644
--- a/src= /openvpn/lzo.c
+++ b/src/openvpn/lzo.c
@@ -= 107,14 +107,14 @@
{
msg(M_FAT= AL, "Cannot initialize LZO compression library (lzo_init() returns %d)= ", lzo_status);
}
- compctx->wu.lzo.wmem =3D (lzo_voidp) lzo_mallo= c(compctx->wu.lzo.wmem_size);
+ compctx->wu.lzo.wmem =3D (lzo_voidp) malloc(compctx->= ;wu.lzo.wmem_size);
check_malloc_return(compctx->wu= .lzo.wmem);
}

static vo= id
lzo_compress_uninit(struct compress_context *compctx)
{
- = lzo_free(compctx->wu.lzo.wmem);
+ free(compctx->wu.lzo.wmem);
comp= ctx->wu.lzo.wmem =3D 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 mag= ic 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<= /span>
- * avoid it being incl= ude by lzoutil.h */
+= * are setup to include the paths without lzo/
+ */
#include <lzodefs.h><= /span>
#include <lzoconf.h>
#endif<= br>-#if defined(HAVE_LZO_LZOUTIL_= H)
-#include <lzo/lz= outil.h>
-#elif defi= ned(HAVE_LZOUTIL_H)
-#i= nclude <lzoutil.h>
change 642. To unsubscribe, or = for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I32ee28fde5d38d736f753c782d8= 8a81de7fe2980
Gerrit-Change-Number: 642
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--NiGu1CZ/TG4=--