From d7871914acd2ed77f43344e36e08944524a67d9e Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 16 Jan 2017 00:10:38 +0100 Subject: Fix dangerous casts On Windows 64-bit, the size of long is 32-bit, thus any pointer to long cast is not valid. In any case, one should use intptr_t and ptrdiff_t when casting to integers. This commit attempts to fix all instances reported by GCC. When relevant, I replaced code by the macros PTR_ADD, ALIGN_UP from system.h Change-Id: I2273b0e8465d3c4689824717ed5afa5ed238a2dc --- lib/rbcodec/codecs/libtremor/codebook.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/rbcodec/codecs/libtremor/codebook.c') diff --git a/lib/rbcodec/codecs/libtremor/codebook.c b/lib/rbcodec/codecs/libtremor/codebook.c index 7087f0a323..f3ac5a2b7e 100644 --- a/lib/rbcodec/codecs/libtremor/codebook.c +++ b/lib/rbcodec/codecs/libtremor/codebook.c @@ -293,7 +293,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, if(b->endbyte < b->storage - 8) { ogg_uint32_t *ptr; unsigned long bit, bitend; - unsigned long adr; + intptr_t adr; ogg_uint32_t cache = 0; int cachesize = 0; const unsigned int cachemask = (1<dec_firsttablen)-1; @@ -303,7 +303,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, const ogg_uint32_t *book_codelist = book->codelist; const char *book_dec_codelengths = book->dec_codelengths; - adr = (unsigned long)b->ptr; + adr = (intptr_t)b->ptr; bit = (adr&3)*8+b->endbit; ptr = (ogg_uint32_t*)(adr&~3); bitend = ((adr&3)+(b->storage-b->endbyte))*8; @@ -334,7 +334,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, cache >>= l; } - adr=(unsigned long)b->ptr; + adr=(intptr_t)b->ptr; bit-=(adr&3)*8+cachesize; b->endbyte+=bit/8; b->ptr+=bit/8; -- cgit v1.2.3