From: Carl Woffenden <cwoffenden@gmail.com>
Date: Tue, 7 Apr 2020 09:25:16 +0000 (+0200)
Subject: Further replication removed
X-Git-Tag: v1.4.5^2~66^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93fadfcd925012d2754c1962c486a7b65fc16e9;p=thirdparty%2Fzstd.git

Further replication removed

`CHECK_F` is now in `error_private.h`. Minor tidy.
---

diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c
index ed69dfd03..5cab31d04 100644
--- a/lib/compress/huf_compress.c
+++ b/lib/compress/huf_compress.c
@@ -40,10 +40,6 @@
 ****************************************************************/
 #define HUF_isError ERR_isError
 #define HUF_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)   /* use only *after* variable declarations */
-#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
-#ifndef CHECK_F
-#define CHECK_F(f)   { CHECK_V_F(_var_err__, f); }
-#endif
 
 
 /* **************************************************************
diff --git a/lib/decompress/huf_decompress.c b/lib/decompress/huf_decompress.c
index a2478b4c7..ab5db481c 100644
--- a/lib/decompress/huf_decompress.c
+++ b/lib/decompress/huf_decompress.c
@@ -41,9 +41,6 @@
 *  Error Management
 ****************************************************************/
 #define HUF_isError ERR_isError
-#ifndef CHECK_F
-#define CHECK_F(f) { size_t const err_ = (f); if (HUF_isError(err_)) return err_; }
-#endif
 
 
 /* **************************************************************
diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index a7fcd57fe..6ef156b65 100644
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -1499,7 +1499,6 @@ size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize)
 
 /* *****   Decompression   ***** */
 
-
 static int ZSTD_DCtx_isOverflow(ZSTD_DStream* zds, size_t const neededInBuffSize, size_t const neededOutBuffSize)
 {
     return (zds->inBuffSize + zds->outBuffSize) >= (neededInBuffSize + neededOutBuffSize) * ZSTD_WORKSPACETOOLARGE_FACTOR;