d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vendor/libarchive/dist to git 7d6da880ae3e379d463137510bb4e8c65b6bfb36

Browse Source 
Relevant vendor changes:
  PR #1107: RAR5 reader: removed an unused function: bf_is_last_block
This commit is contained in:
Martin Matuska 2018-12-13 11:04:59 +00:00
parent 375ea06b32
commit 8f080f5de1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libarchive/archive_read_support_format_rar5.c
View File

@ -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;
};
@ -432,11 +439,6 @@ uint8_t bf_byte_count(const struct compressed_block_header* hdr) {
return (hdr->block_flags_u8 >> 3) & 7;
}
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;