From: Nick Terrell <terrelln@fb.com>
Date: Tue, 15 Aug 2017 18:23:28 +0000 (-0700)
Subject: [FSE][HUF] Inline error checks
X-Git-Tag: v1.3.1^2~11^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07c6ff588ed1af5066bf0584b5013d48eda880fe;p=thirdparty%2Fzstd.git

[FSE][HUF] Inline error checks

Caught by Clang's optimization remarks.
---

diff --git a/lib/common/fse_decompress.c b/lib/common/fse_decompress.c
index 8474a4c07..1a1977989 100644
--- a/lib/common/fse_decompress.c
+++ b/lib/common/fse_decompress.c
@@ -62,6 +62,7 @@
 #include "bitstream.h"
 #define FSE_STATIC_LINKING_ONLY
 #include "fse.h"
+#include "error_private.h"
 
 
 /* **************************************************************
diff --git a/lib/compress/fse_compress.c b/lib/compress/fse_compress.c
index 3a03627cc..05ccc3fd5 100644
--- a/lib/compress/fse_compress.c
+++ b/lib/compress/fse_compress.c
@@ -62,11 +62,13 @@
 #include "bitstream.h"
 #define FSE_STATIC_LINKING_ONLY
 #include "fse.h"
+#include "error_private.h"
 
 
 /* **************************************************************
 *  Error Management
 ****************************************************************/
+#define FSE_isError ERR_isError
 #define FSE_STATIC_ASSERT(c) { enum { FSE_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
 
 
diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c
index 953cb5f21..2a47c1820 100644
--- a/lib/compress/huf_compress.c
+++ b/lib/compress/huf_compress.c
@@ -50,11 +50,13 @@
 #include "fse.h"        /* header compression */
 #define HUF_STATIC_LINKING_ONLY
 #include "huf.h"
+#include "error_private.h"
 
 
 /* **************************************************************
 *  Error Management
 ****************************************************************/
+#define HUF_isError ERR_isError
 #define HUF_STATIC_ASSERT(c) { enum { HUF_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
 #define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
 #define CHECK_F(f)   { CHECK_V_F(_var_err__, f); }
diff --git a/lib/decompress/huf_decompress.c b/lib/decompress/huf_decompress.c
index 0a47a3d74..39530a64f 100644
--- a/lib/decompress/huf_decompress.c
+++ b/lib/decompress/huf_decompress.c
@@ -59,11 +59,13 @@
 #include "fse.h"        /* header compression */
 #define HUF_STATIC_LINKING_ONLY
 #include "huf.h"
+#include "error_private.h"
 
 
 /* **************************************************************
 *  Error Management
 ****************************************************************/
+#define HUF_isError ERR_isError
 #define HUF_STATIC_ASSERT(c) { enum { HUF_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */