1 files changed, 26 insertions, 18 deletions
diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h
index 5dd7a87f..4f30427d 100644
--- a/src/liblzma/common/common.h
+++ b/src/liblzma/common/common.h
@@ -21,6 +21,7 @@
 #define LZMA_COMMON_H
 
 #include "../../common/sysdefs.h"
+#include "../../common/integer.h"
 
 // Don't use ifdef...
 #if HAVE_VISIBILITY
@@ -30,6 +31,17 @@
 #endif
 
 
+// These allow helping the compiler in some often-executed branches, whose
+// result is almost always the same.
+#ifdef __GNUC__
+#	define likely(expr) __builtin_expect(expr, true)
+#	define unlikely(expr) __builtin_expect(expr, false)
+#else
+#	define likely(expr) (expr)
+#	define unlikely(expr) (expr)
+#endif
+
+
 /// Size of temporary buffers needed in some filters
 #define LZMA_BUFFER_SIZE 4096
 
@@ -117,10 +129,6 @@ struct lzma_filter_info_s {
 
 	/// Pointer to filter's options structure
 	void *options;
-
-	/// Uncompressed size of the filter, or LZMA_VLI_VALUE_UNKNOWN
-	/// if unknown.
-	lzma_vli uncompressed_size;
 };
 
 
@@ -158,20 +166,6 @@ extern void lzma_next_coder_end(lzma_next_coder *next,
 		lzma_allocator *allocator);
 
 
-extern lzma_ret lzma_filter_flags_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, lzma_options_filter *options);
-
-extern lzma_ret lzma_block_header_decoder_init(lzma_next_coder *next,
-		lzma_allocator *allocator, lzma_options_block *options);
-
-extern lzma_ret lzma_stream_encoder_single_init(lzma_next_coder *next,
-		lzma_allocator *allocator, const lzma_options_stream *options);
-
-extern lzma_ret lzma_stream_decoder_init(
-		lzma_next_coder *next, lzma_allocator *allocator,
-		lzma_extra **header, lzma_extra **footer);
-
-
 /// \brief      Wrapper for memcpy()
 ///
 /// This function copies as much data as possible from in[] to out[] and
@@ -225,6 +219,13 @@ do { \
 	lzma_next_coder_init2(next, allocator, \
 			func, func, allocator, __VA_ARGS__)
 
+/// \brief      Initializing lzma_next_coder
+///
+/// Call the initialization function, which takes no other arguments than
+/// lzma_next_coder and lzma_allocator.
+#define lzma_next_coder_init0(func, next, allocator) \
+	lzma_next_coder_init2(next, allocator, func, func, allocator)
+
 
 /// \brief      Initializing lzma_stream
 ///
@@ -254,6 +255,13 @@ do { \
 #define lzma_next_strm_init(strm, func, ...) \
 	lzma_next_strm_init2(strm, func, func, (strm)->allocator, __VA_ARGS__)
 
+/// \brief      Initializing lzma_stream
+///
+/// Call the initialization function, which takes no other arguments than
+/// lzma_next_coder and lzma_allocator.
+#define lzma_next_strm_init0(strm, func) \
+	lzma_next_strm_init2(strm, func, func, (strm)->allocator)
+
 
 /// \brief      Return if expression doesn't evaluate to LZMA_OK
 ///