move return_if_error macro to internals.h

vteromero · Feb 14, 2022 · 1c7ebf3 · 1c7ebf3
1 parent 70a034a
commit 1c7ebf3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/bitstream.h b/bitstream.h
@@ -11,7 +11,6 @@
 #include <stdint.h>
 
 #include "internals.h"
-#include "error.h"
 #include "mem.h"
 
 struct bswriter {

diff --git a/decode_generic.h b/decode_generic.h
@@ -8,7 +8,6 @@
 
 #include "bitstream.h"
 #include "common.h"
-#include "error.h"
 #include "internals.h"
 
 #define decctx_(_width_) BITWIDTH_SUFFIX(decctx, _width_)

diff --git a/encode_generic.h b/encode_generic.h
@@ -9,7 +9,6 @@
 #include "bitstream.h"
 #include "common.h"
 #include "countbits.h"
-#include "error.h"
 #include "internals.h"
 
 #define encctx_(_width_) BITWIDTH_SUFFIX(encctx, _width_)

diff --git a/error.h b/error.h
diff --git a/internals.h b/internals.h
@@ -40,4 +40,13 @@ struct vtenc {
   size_t out_size;              /* Output size in bytes */
 };
 
+/* Error-handling helper macro */
+#define return_if_error(exp)  \
+do {                          \
+  const int code = (exp);     \
+  if (code != VTENC_OK) {     \
+    return code;              \
+  }                           \
+} while(0)
+
 #endif /* VTENC_INTERNALS_H_ */