diff options
author | Eugene Kliuchnikov <eustas@google.com> | 2018-06-11 15:17:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-11 15:17:26 +0200 |
commit | 09cd3e877f583e6352be146ab22415298366c8d6 (patch) | |
tree | 0821b6990772332b57c6cb37ed045af7fbbbc9d7 | |
parent | 8544ae858d87056c8dac55713ffe148d9c60eb93 (diff) | |
download | brotli-09cd3e877f583e6352be146ab22415298366c8d6.zip brotli-09cd3e877f583e6352be146ab22415298366c8d6.tar.gz brotli-09cd3e877f583e6352be146ab22415298366c8d6.tar.bz2 |
Update
-rwxr-xr-x | c/common/transform.c | 3 | ||||
-rwxr-xr-x | c/common/transform.h | 2 | ||||
-rw-r--r-- | c/dec/bit_reader.h | 2 | ||||
-rw-r--r-- | c/dec/decode.c | 7 | ||||
-rw-r--r-- | java/org/brotli/wrapper/common/SetRfcDictionaryTest.java | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/c/common/transform.c b/c/common/transform.c index 53fe4f6..4184ae5 100755 --- a/c/common/transform.c +++ b/c/common/transform.c @@ -4,7 +4,6 @@ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT */ -#include "./platform.h" #include "./transform.h" #if defined(__cplusplus) || defined(c_plusplus) @@ -192,7 +191,7 @@ static int ToUpperCase(uint8_t* p) { } int BrotliTransformDictionaryWord(uint8_t* dst, const uint8_t* word, int len, - const BrotliTransforms* BROTLI_RESTRICT transforms, int transfom_idx) { + const BrotliTransforms* transforms, int transfom_idx) { int idx = 0; const uint8_t* prefix = BROTLI_TRANSFORM_PREFIX(transforms, transfom_idx); uint8_t type = BROTLI_TRANSFORM_TYPE(transforms, transfom_idx); diff --git a/c/common/transform.h b/c/common/transform.h index 83f401c..456c12d 100755 --- a/c/common/transform.h +++ b/c/common/transform.h @@ -71,7 +71,7 @@ BROTLI_COMMON_API const BrotliTransforms* BrotliGetTransforms(void); BROTLI_COMMON_API int BrotliTransformDictionaryWord( uint8_t* dst, const uint8_t* word, int len, - const BrotliTransforms* BROTLI_RESTRICT transforms, int transform_idx); + const BrotliTransforms* transforms, int transform_idx); #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ diff --git a/c/dec/bit_reader.h b/c/dec/bit_reader.h index 39e4873..c06e914 100644 --- a/c/dec/bit_reader.h +++ b/c/dec/bit_reader.h @@ -238,7 +238,7 @@ static BROTLI_INLINE void BrotliTakeBits( BrotliBitReader* const br, uint32_t n_bits, uint32_t* val) { *val = (uint32_t)BrotliGetBitsUnmasked(br) & BitMask(n_bits); BROTLI_LOG(("[BrotliReadBits] %d %d %d val: %6x\n", - (int)br->avail_in, (int)br->bit_pos_, n_bits, (int)*val)); + (int)br->avail_in, (int)br->bit_pos_, (int)n_bits, (int)*val)); BrotliDropBits(br, n_bits); } diff --git a/c/dec/decode.c b/c/dec/decode.c index 278b622..674b829 100644 --- a/c/dec/decode.c +++ b/c/dec/decode.c @@ -516,7 +516,8 @@ static BROTLI_INLINE void ProcessSingleCodeLength(uint32_t code_len, *prev_code_len = code_len; *space -= 32768U >> code_len; code_length_histo[code_len]++; - BROTLI_LOG(("[ReadHuffmanCode] code_length[%d] = %d\n", *symbol, code_len)); + BROTLI_LOG(("[ReadHuffmanCode] code_length[%d] = %d\n", + (int)*symbol, (int)code_len)); } (*symbol)++; } @@ -561,7 +562,7 @@ static BROTLI_INLINE void ProcessRepeatedCodeLength(uint32_t code_len, return; } BROTLI_LOG(("[ReadHuffmanCode] code_length[%d..%d] = %d\n", - *symbol, *symbol + repeat_delta - 1, *repeat_code_len)); + (int)*symbol, (int)(*symbol + repeat_delta - 1), (int)*repeat_code_len)); if (*repeat_code_len != 0) { unsigned last = *symbol + repeat_delta; int next = next_symbol[*repeat_code_len]; @@ -832,7 +833,7 @@ static BrotliDecoderErrorCode ReadHuffmanCode(uint32_t alphabet_size, } if (s->space != 0) { - BROTLI_LOG(("[ReadHuffmanCode] space = %d\n", s->space)); + BROTLI_LOG(("[ReadHuffmanCode] space = %d\n", (int)s->space)); return BROTLI_FAILURE(BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE); } table_size = BrotliBuildHuffmanTable( diff --git a/java/org/brotli/wrapper/common/SetRfcDictionaryTest.java b/java/org/brotli/wrapper/common/SetRfcDictionaryTest.java index 8aecf5f..a986eae 100644 --- a/java/org/brotli/wrapper/common/SetRfcDictionaryTest.java +++ b/java/org/brotli/wrapper/common/SetRfcDictionaryTest.java @@ -9,14 +9,12 @@ package org.brotli.wrapper.common; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.brotli.dec.Dictionary; import org.brotli.integration.BrotliJniTestBase; import org.brotli.wrapper.dec.BrotliInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import org.junit.Test; |