aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2018-12-13 11:04:59 +0000
committerMartin Matuska <mm@FreeBSD.org>2018-12-13 11:04:59 +0000
commit8f080f5de123dc76bd3025310c312eb06d24e78d (patch)
tree96d9d268f7409230d94ced427fef9b17534ac083
parent375ea06b32468151d3b8034c0f13a7481992a19e (diff)
downloadsrc-8f080f5de123dc76bd3025310c312eb06d24e78d.tar.gz
src-8f080f5de123dc76bd3025310c312eb06d24e78d.zip
Update vendor/libarchive/dist to git 7d6da880ae3e379d463137510bb4e8c65b6bfb36
Relevant vendor changes: PR #1107: RAR5 reader: removed an unused function: bf_is_last_block
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=342040
-rw-r--r--libarchive/archive_read_support_format_rar5.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c
index 86478a4949fa..9314f7a9f9c3 100644
--- a/libarchive/archive_read_support_format_rar5.c
+++ b/libarchive/archive_read_support_format_rar5.c
@@ -229,7 +229,14 @@ struct bit_reader {
/* RARv5 block header structure. Use bf_* functions to get values from
* block_flags_u8 field. I.e. bf_byte_count, etc. */
struct compressed_block_header {
- uint8_t block_flags_u8; /* Fields encoded in little-endian bitfield */
+ /* block_flags_u8 contain fields encoded in little-endian bitfield:
+ *
+ * - table present flag (shr 7, and 1),
+ * - last block flag (shr 6, and 1),
+ * - byte_count (shr 3, and 7),
+ * - bit_size (shr 0, and 7).
+ */
+ uint8_t block_flags_u8;
uint8_t block_cksum;
};
@@ -433,11 +440,6 @@ uint8_t bf_byte_count(const struct compressed_block_header* hdr) {
}
static inline
-uint8_t bf_is_last_block(const struct compressed_block_header* hdr) {
- return (hdr->block_flags_u8 >> 6) & 1;
-}
-
-static inline
uint8_t bf_is_table_present(const struct compressed_block_header* hdr) {
return (hdr->block_flags_u8 >> 7) & 1;
}