From 07c6ff588ed1af5066bf0584b5013d48eda880fe Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Tue, 15 Aug 2017 11:23:28 -0700
Subject: [PATCH] [FSE][HUF] Inline error checks

Caught by Clang's optimization remarks.
---
 lib/common/fse_decompress.c     | 1 +
 lib/compress/fse_compress.c     | 2 ++
 lib/compress/huf_compress.c     | 2 ++
 lib/decompress/huf_decompress.c | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/lib/common/fse_decompress.c b/lib/common/fse_decompress.c
index 8474a4c0..1a197798 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 3a03627c..05ccc3fd 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 953cb5f2..2a47c182 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 0a47a3d7..39530a64 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 */