Change in openvpn[master]: LZO: do not use lzoutils.h macros
A message that is not in the archive (sent off-list or not yet received): gerrit.1717513301000.I32ee28fde5d38d736f753c782d88a81de7fe2980@...2715...
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.
---
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
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/642?usp=email )
Change subject: LZO: do not use lzoutils.h macros
......................................................................
Patch Set 1: Code-Review+2
--
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 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 04 Jun 2024 16:21:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v2 1/1 LZO: do not use lzoutils.h macros
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
Instead of lzo_{free,malloc} we can just use the
free and malloc as the lzoutils.h header itself
suggests.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/642
This mail reflects revision 2 of this Change.
Acked-by according to Gerrit (reflected above):
Arne Schwabe <[email protected]...>
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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 )
[Openvpn-devel] [PATCH applied] Re: LZO: do not use lzoutils.h macros
Lightly tested via local builds and GHA. This is basically a no-op, as lzoutils.h contains
#define lzo_malloc(a) (malloc(a)) #define lzo_free(a) (free(a))
.. and nothing more complicated. Having lzoutil.h out of the way paves the way for "make lzo2.pc pkg-config checks work" :-)
Your patch has been applied to the master and release/2.6 branch (I see this as "long-term compat" for building).
commit d601237976323b5d8f6ac65c27ccc510563ad75f (master) commit 1ae753e4240434abda0a33aed07b289fa9c6ee79 (release/2.6)
Author: Frank Lichtenheld Date: Tue Jun 4 23:17:08 2024 +0200
LZO: do not use lzoutils.h macros
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28705.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/642?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28705.html
---
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/3
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -1161,15 +1161,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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/642?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28705.html
---
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(-)
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -1161,15 +1161,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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged
Attention is currently required from: cron2, flichtenheld, plaisthos.
its_Giaan has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/642?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28705.html
---
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/3
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -1161,15 +1161,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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/642?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28705.html
---
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(-)
config.h.cmake.in +0 -3
@@ -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
configure.ac +0 -9
@@ -1161,15 +1161,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(
src/openvpn/lzo.c +2 -2
@@ -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 ; }
src/openvpn/lzo.h +2 -7
@@ -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: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged