Kelson has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330236 )
Change subject: Fix use of ENABLE_* by preprocessor. ...................................................................... Fix use of ENABLE_* by preprocessor. If a compression lib is not present, the associated ENABLE_* is not defined. So we need to always test for the definition existance and not for its value. This is not the case in zimcreator.cpp with the #ifdef/#elif construction. We also change other (correct) syntax #ifdef to #if defined() to keep some consistency. Change-Id: I86d4309bfcdeeb3356d0fb4f192d0849a5e57275 --- M zimlib/src/cluster.cpp M zimlib/src/zimcreator.cpp M zimlib/test/cluster.cpp 3 files changed, 24 insertions(+), 24 deletions(-) Approvals: Kelson: Verified; Looks good to me, approved diff --git a/zimlib/src/cluster.cpp b/zimlib/src/cluster.cpp index 9dbefdc..e944ec6 100644 --- a/zimlib/src/cluster.cpp +++ b/zimlib/src/cluster.cpp @@ -28,17 +28,17 @@ #include "config.h" -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) #include <zim/deflatestream.h> #include <zim/inflatestream.h> #endif -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) #include <zim/bzip2stream.h> #include <zim/bunzip2stream.h> #endif -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) #include <zim/lzmastream.h> #include <zim/unlzmastream.h> #endif @@ -212,7 +212,7 @@ case zimcompZip: { -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) log_debug("uncompress data (zlib)"); zim::InflateStream is(in); is.exceptions(std::ios::failbit | std::ios::badbit); @@ -226,7 +226,7 @@ case zimcompBzip2: { -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) log_debug("uncompress data (bzip2)"); zim::Bunzip2Stream is(in); is.exceptions(std::ios::failbit | std::ios::badbit); @@ -240,7 +240,7 @@ case zimcompLzma: { -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) log_debug("uncompress data (lzma)"); zim::UnlzmaStream is(in); is.exceptions(std::ios::failbit | std::ios::badbit); @@ -274,7 +274,7 @@ case zimcompZip: { -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) log_debug("compress data (zlib)"); zim::DeflateStream os(out); os.exceptions(std::ios::failbit | std::ios::badbit); @@ -288,7 +288,7 @@ case zimcompBzip2: { -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) log_debug("compress data (bzip2)"); zim::Bzip2Stream os(out); os.exceptions(std::ios::failbit | std::ios::badbit); @@ -302,7 +302,7 @@ case zimcompLzma: { -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) uint32_t lzmaPreset = 3 | LZMA_PRESET_EXTREME; /** * read lzma preset from environment diff --git a/zimlib/src/zimcreator.cpp b/zimlib/src/zimcreator.cpp index 1e4a21c..fac4c96 100644 --- a/zimlib/src/zimcreator.cpp +++ b/zimlib/src/zimcreator.cpp @@ -55,11 +55,11 @@ ZimCreator::ZimCreator() : minChunkSize(1024-64), nextMimeIdx(0), -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) compression(zimcompLzma), -#elif ENABLE_BZIP2 +#elif defined(ENABLE_BZIP2) compression(zimcompBzip2), -#elif ENABLE_ZLIB +#elif defined(ENABLE_ZLIB) compression(zimcompZip), #else compression(zimcompNone), @@ -70,11 +70,11 @@ ZimCreator::ZimCreator(int& argc, char* argv[]) : nextMimeIdx(0), -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) compression(zimcompLzma), -#elif ENABLE_BZIP2 +#elif defined(ENABLE_BZIP2) compression(zimcompBzip2), -#elif ENABLE_ZLIB +#elif defined( ENABLE_ZLIB) compression(zimcompZip), #else compression(zimcompNone), @@ -87,15 +87,15 @@ else minChunkSize = Arg<unsigned>(argc, argv, 's', 1024-64); -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) if (Arg<bool>(argc, argv, "--zlib")) compression = zimcompZip; #endif -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) if (Arg<bool>(argc, argv, "--bzip2")) compression = zimcompBzip2; #endif -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) if (Arg<bool>(argc, argv, "--lzma")) compression = zimcompLzma; #endif diff --git a/zimlib/test/cluster.cpp b/zimlib/test/cluster.cpp index 687c1e1..b907bad 100644 --- a/zimlib/test/cluster.cpp +++ b/zimlib/test/cluster.cpp @@ -39,13 +39,13 @@ registerMethod("CreateCluster", *this, &ClusterTest::CreateCluster); registerMethod("ReadWriteCluster", *this, &ClusterTest::ReadWriteCluster); registerMethod("ReadWriteEmpty", *this, &ClusterTest::ReadWriteEmpty); -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) registerMethod("ReadWriteClusterZ", *this, &ClusterTest::ReadWriteClusterZ); #endif -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) registerMethod("ReadWriteClusterBz2", *this, &ClusterTest::ReadWriteClusterBz2); #endif -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) registerMethod("ReadWriteClusterLzma", *this, &ClusterTest::ReadWriteClusterLzma); #endif } @@ -126,7 +126,7 @@ std::remove(name.c_str()); } -#ifdef ENABLE_ZLIB +#if defined(ENABLE_ZLIB) void ReadWriteClusterZ() { std::string name = std::tmpnam(NULL); @@ -164,7 +164,7 @@ #endif -#ifdef ENABLE_BZIP2 +#if defined(ENABLE_BZIP2) void ReadWriteClusterBz2() { std::string name = std::tmpnam(NULL); @@ -202,7 +202,7 @@ #endif -#ifdef ENABLE_LZMA +#if defined(ENABLE_LZMA) void ReadWriteClusterLzma() { std::string name = std::tmpnam(NULL); -- To view, visit https://gerrit.wikimedia.org/r/330236 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86d4309bfcdeeb3356d0fb4f192d0849a5e57275 Gerrit-PatchSet: 1 Gerrit-Project: openzim Gerrit-Branch: master Gerrit-Owner: Mgautierfr <mgaut...@kymeria.fr> Gerrit-Reviewer: Kelson <kel...@kiwix.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits