Author: mm
Date: Thu Dec 13 11:04:59 2018
New Revision: 342040
URL: https://svnweb.freebsd.org/changeset/base/342040

Log:
  Update vendor/libarchive/dist to git 7d6da880ae3e379d463137510bb4e8c65b6bfb36
  
  Relevant vendor changes:
    PR #1107: RAR5 reader: removed an unused function: bf_is_last_block

Modified:
  vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c

Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c        
Thu Dec 13 10:55:48 2018        (r342039)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c        
Thu Dec 13 11:04:59 2018        (r342040)
@@ -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;
 };
 
@@ -430,11 +437,6 @@ uint8_t bf_bit_size(const struct compressed_block_head
 static inline
 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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to