From: "flichtenheld (Code Review)" Date: Tue, 4 Jun 2024 15:01:43 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <425409ca95aef27b97e7e0c8f60a106a5fb8c36c-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="QlOr6pLXcVg="; 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: plaisthos Cc: openvpn-devel --QlOr6pLXcVg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=3Demail 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 --- 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 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 d834f30..bb87c59 100644 --- a/configure.ac +++ b/configure.ac @@ -1174,15 +1174,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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --QlOr6pLXcVg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

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 it= self
suggests.

Change-Id: I32ee28fde5d38d736f753c782d88a81de7fe29= 80
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---
M= config.h.cmake.in
M configure.ac
M src/openvpn/lzo.c
M src/openvp= n/lzo.h
4 files changed, 4 insertions(+), 21 deletions(-)

<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">git = pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/642/1d= iff --git a/config.h.cmake.in b/config.h.cmake.in
index 2cd= fdcc..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. */
-#def= ine HAVE_LZOUTIL_H 1
-<= /span>
/* 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/co= nfigure.ac
@@ -1174,15 +1174,6 @@
saved_C= FLAGS=3D"${CFLAGS}"
CFLAGS=3D"${CFLAGS} ${= LZO_CFLAGS}"
AC_CHECK_HEADERS(
- [lzo/lzoutil.h],
- ,
- [AC_CHECK_HEADERS(
- [lzoutil.h],
- ,
- [AC_MSG_ER= ROR([lzoutil.h is missing])]
- )]
- )<= br>- AC_CHECK_HEADERS(
= [lzo/lzo1x.h],
,
[AC_CHECK_H= EADERS(
diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c<= /span>
index b313284..bab2d78 100644
--- a/src/ope= nvpn/lzo.c
+++ b/src/openvpn/lzo.c
@@ -107,= 14 +107,14 @@
{
msg(M_FATAL, = "Cannot initialize LZO compression library (lzo_init() returns %d)&quo= t;, lzo_status);
}
- compctx->wu.lzo.wmem =3D (lzo_voidp) lzo_malloc(co= mpctx->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 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

inde= x 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 g= ets confused and still wants
* to include lzo/lzoconf.h e= ven if our include paths
- * avoid it being include = by lzoutil.h */
+ * a= re setup to include the paths without lzo/
+ */
#include <lzodefs.h>

#include <lzoconf.h>
#endif
<= span style=3D"color: hsl(0, 100%, 40%);">-#if defined(HAVE_LZO_LZOUTIL_H)
-#include <lzo/lzouti= l.h>
-#elif defined(= HAVE_LZOUTIL_H)
-#inclu= de <lzoutil.h>
-#= endif
#if defined(HAVE_LZO_LZO1X_H)
#incl= ude <lzo/lzo1x.h>
#elif defined(HAVE_LZO1X_H)=

To view, visit 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: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--QlOr6pLXcVg=--