From 0cf34918bfc5c431cd582bf0ef1ba2b25b544613 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 26 Oct 2021 15:33:45 -0400
Subject: [PATCH] Remove ZSTD_ENABLED checks from the Package Kit.

BZstdCompressionAlgorithm already has these #ifdefs and will
return error codes appropriately if built without libzstd,
so we do not need to check again inside the Package Kit.

This should not break the no-zstd build (well, it is broken
somewhat right now anyway, but this will not break it further),
and it simplifies logic somewhat.
---
 src/add-ons/kernel/file_systems/packagefs/Jamfile | 4 +---
 src/kits/package/Jamfile                          | 3 ---
 src/kits/package/hpkg/ReaderImplBase.cpp          | 4 ----
 src/kits/package/hpkg/WriterImplBase.cpp          | 4 ----
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 9a9aae2640..7122663e2b 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -5,11 +5,9 @@ UseBuildFeatureHeaders zlib ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders package shared storage support file_systems ;
 
-local zstdSources ;
 local zstdKernelLib ;
 
 if [ FIsBuildFeatureEnabled zstd ] {
-	zstdSources = ZstdCompressionAlgorithm.cpp ;
 	zstdKernelLib = kernel_libzstd.a ;
 	UseBuildFeatureHeaders zstd ;
 	Includes [ FGristFiles $(zstdSources) ]
@@ -112,7 +110,7 @@ local storageKitSources =
 local supportKitSources =
 	CompressionAlgorithm.cpp
 	ZlibCompressionAlgorithm.cpp
-	$(zstdSources)
+	ZstdCompressionAlgorithm.cpp
 ;
 
 KernelAddon packagefs
diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile
index c2381a4ae9..a4b497a824 100644
--- a/src/kits/package/Jamfile
+++ b/src/kits/package/Jamfile
@@ -64,9 +64,6 @@ HPKG_SOURCES =
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
-		if [ FIsBuildFeatureEnabled zstd ] {
-			SubDirC++Flags -DZSTD_ENABLED ;
-		}
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package manager ] ;
diff --git a/src/kits/package/hpkg/ReaderImplBase.cpp b/src/kits/package/hpkg/ReaderImplBase.cpp
index b49ca6416a..a054c74667 100644
--- a/src/kits/package/hpkg/ReaderImplBase.cpp
+++ b/src/kits/package/hpkg/ReaderImplBase.cpp
@@ -20,9 +20,7 @@
 #include <DataIO.h>
 
 #include <ZlibCompressionAlgorithm.h>
-#ifdef ZSTD_ENABLED
 #include <ZstdCompressionAlgorithm.h>
-#endif
 
 #include <package/hpkg/HPKGDefsPrivate.h>
 #include <package/hpkg/PackageFileHeapReader.h>
@@ -834,7 +832,6 @@ ReaderImplBase::InitHeapReader(uint32 compression, uint32 chunkSize,
 				return B_NO_MEMORY;
 			}
 			break;
-#ifdef ZSTD_ENABLED
 		case B_HPKG_COMPRESSION_ZSTD:
 			decompressionAlgorithm = DecompressionAlgorithmOwner::Create(
 				new(std::nothrow) BZstdCompressionAlgorithm,
@@ -846,7 +843,6 @@ ReaderImplBase::InitHeapReader(uint32 compression, uint32 chunkSize,
 				return B_NO_MEMORY;
 			}
 			break;
-#endif
 		default:
 			fErrorOutput->PrintError("Error: Invalid heap compression\n");
 			return B_BAD_DATA;
diff --git a/src/kits/package/hpkg/WriterImplBase.cpp b/src/kits/package/hpkg/WriterImplBase.cpp
index c5b542ee4a..7eb4596c89 100644
--- a/src/kits/package/hpkg/WriterImplBase.cpp
+++ b/src/kits/package/hpkg/WriterImplBase.cpp
@@ -20,9 +20,7 @@
 
 #include <AutoDeleter.h>
 #include <ZlibCompressionAlgorithm.h>
-#ifdef ZSTD_ENABLED
 #include <ZstdCompressionAlgorithm.h>
-#endif
 
 #include <package/hpkg/DataReader.h>
 #include <package/hpkg/ErrorOutput.h>
@@ -329,7 +327,6 @@ WriterImplBase::InitHeapReader(size_t headerSize)
 				throw std::bad_alloc();
 			}
 			break;
-#ifdef ZSTD_ENABLED
 		case B_HPKG_COMPRESSION_ZSTD:
 			compressionAlgorithm = CompressionAlgorithmOwner::Create(
 				new(std::nothrow) BZstdCompressionAlgorithm,
@@ -351,7 +348,6 @@ WriterImplBase::InitHeapReader(size_t headerSize)
 				throw std::bad_alloc();
 			}
 			break;
-#endif
 		default:
 			fErrorOutput->PrintError("Error: Invalid heap compression\n");
 			return B_BAD_VALUE;