Changeset 1993 for xz/vendor/current/src/liblzma/common/block_encoder.c

Timestamp:

Feb 8, 2017, 8:58:22 PM (8 years ago)

Author:

Silvan Scherrer

Message:

xz: update vendor to version 5.2.3

File:

• xz/vendor/current/src/liblzma/common/block_encoder.c (modified) (5 diffs)

xz/vendor/current/src/liblzma/common/block_encoder.c ¶

@@ -16 +16 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         /// The filters in the chain; initialized with lzma_raw_decoder_init().
         lzma_next_coder next;
@@ -42 +42 @@
         /// Check of the uncompressed data
         lzma_check_state check;
-};
+} lzma_block_coder;
 
 
 static lzma_ret
-block_encode(lzma_coder *coder, const lzma_allocator *allocator,
+block_encode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_block_coder *coder = coder_ptr;
+
         // Check that our amount of input stays in proper limits.
         if (LZMA_VLI_MAX - coder->uncompressed_size < in_size - *in_pos)
@@ -135 +137 @@
 
 static void
-block_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+block_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_block_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -144 +147 @@
 
 static lzma_ret
-block_encoder_update(lzma_coder *coder, const lzma_allocator *allocator,
+block_encoder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters lzma_attribute((__unused__)),
                 const lzma_filter *reversed_filters)
 {
+        lzma_block_coder *coder = coder_ptr;
+
         if (coder->sequence != SEQ_CODE)
                 return LZMA_PROG_ERROR;
@@ -179 +184 @@
 
         // Allocate and initialize *next->coder if needed.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_block_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_block_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &block_encode;
                 next->end = &block_encoder_end;
                 next->update = &block_encoder_update;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_CODE;
-        next->coder->block = block;
-        next->coder->compressed_size = 0;
-        next->coder->uncompressed_size = 0;
-        next->coder->pos = 0;
+        coder->sequence = SEQ_CODE;
+        coder->block = block;
+        coder->compressed_size = 0;
+        coder->uncompressed_size = 0;
+        coder->pos = 0;
 
         // Initialize the check
-        lzma_check_init(&next->coder->check, block->check);
+        lzma_check_init(&coder->check, block->check);
 
         // Initialize the requested filters.
-        return lzma_raw_encoder_init(&next->coder->next, allocator,
-                        block->filters);
+        return lzma_raw_encoder_init(&coder->next, allocator, block->filters);
 }