X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fdecompress_common.h;h=70f7dd5a8f4ed508b636ce028105e018f0c81801;hb=151463861a212a1ae7deae7e9844cd0cd1c4343c;hp=148b44ef63d0ee5db26509140d13f95f0dbabf87;hpb=f18b7fc3361c4daac0ddd104af65a8eff8466fec;p=wimlib

diff --git a/include/wimlib/decompress_common.h b/include/wimlib/decompress_common.h
index 148b44ef..70f7dd5a 100644
--- a/include/wimlib/decompress_common.h
+++ b/include/wimlib/decompress_common.h
@@ -10,6 +10,8 @@
 #ifndef _WIMLIB_DECOMPRESS_COMMON_H
 #define _WIMLIB_DECOMPRESS_COMMON_H
 
+#include <string.h>
+
 #include "wimlib/compiler.h"
 #include "wimlib/types.h"
 #include "wimlib/unaligned.h"
@@ -90,9 +92,7 @@ overflow:
 static inline u32
 bitstream_peek_bits(const struct input_bitstream *is, const unsigned num_bits)
 {
-	if (unlikely(num_bits == 0))
-		return 0;
-	return is->bitbuf >> (32 - num_bits);
+	return (is->bitbuf >> 1) >> (sizeof(is->bitbuf) * 8 - num_bits - 1);
 }
 
 /* Remove @num_bits from the bitstream.  There must be at least @num_bits
@@ -159,18 +159,17 @@ bitstream_read_u32(struct input_bitstream *is)
 	return v;
 }
 
-/* Read an array of literal bytes embedded in the bitstream.  Return a pointer
- * to the resulting array, or NULL if the read overflows the input buffer.  */
-static inline const u8 *
-bitstream_read_bytes(struct input_bitstream *is, size_t count)
+/* Read into @dst_buffer an array of literal bytes embedded in the bitstream.
+ * Return either a pointer to the byte past the last written, or NULL if the
+ * read overflows the input buffer.  */
+static inline void *
+bitstream_read_bytes(struct input_bitstream *is, void *dst_buffer, size_t count)
 {
-	const u8 *p;
-
 	if (unlikely(is->end - is->next < count))
 		return NULL;
-	p = is->next;
+	memcpy(dst_buffer, is->next, count);
 	is->next += count;
-	return p;
+	return (u8 *)dst_buffer + count;
 }
 
 /* Align the input bitstream on a coding-unit boundary.  */
@@ -214,7 +213,7 @@ bitstream_align(struct input_bitstream *is)
  *
  * XXX: This is mostly duplicated in lzms_decode_huffman_symbol() in
  * lzms_decompress.c.  */
-static inline u16
+static inline unsigned
 read_huffsym(struct input_bitstream *istream, const u16 decode_table[],
 	     unsigned table_bits, unsigned max_codeword_len)
 {