rework so that rice parameters and raw_bits from the entropy coding method struct...

[platform/upstream/flac.git] / src / libFLAC / bitbuffer.c

diff --git a/src/libFLAC/bitbuffer.c b/src/libFLAC/bitbuffer.c
index f7b1ea9..c0e0078 100644 (file)
--- a/src/libFLAC/bitbuffer.c
+++ b/src/libFLAC/bitbuffer.c
@@ -134,8 +134,8 @@ static FLAC__bool bitbuffer_resize_(FLAC__BitBuffer *bb, unsigned new_capacity)
 {
        FLAC__blurb *new_buffer;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        if(bb->capacity == new_capacity)
                return true;
@@ -155,7 +155,7 @@ static FLAC__bool bitbuffer_resize_(FLAC__BitBuffer *bb, unsigned new_capacity)
                bb->consumed_bits = 0;
                bb->total_consumed_bits = FLAC__BLURBS_TO_BITS(new_capacity);
        }
-       free(bb->buffer); /* we've already asserted above that (bb->buffer != 0) */
+       free(bb->buffer); /* we've already asserted above that (0 != bb->buffer) */
        bb->buffer = new_buffer;
        bb->capacity = new_capacity;
        return true;
@@ -173,8 +173,8 @@ static FLAC__bool bitbuffer_grow_(FLAC__BitBuffer *bb, unsigned min_blurbs_to_ad
 
 static FLAC__bool bitbuffer_ensure_size_(FLAC__BitBuffer *bb, unsigned bits_to_add)
 {
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        if(FLAC__BLURBS_TO_BITS(bb->capacity) < bb->total_bits + bits_to_add)
                return bitbuffer_grow_(bb, (bits_to_add >> FLAC__BITS_PER_BLURB_LOG2) + 2);
@@ -251,12 +251,21 @@ static FLAC__bool bitbuffer_read_from_client_(FLAC__BitBuffer *bb, FLAC__bool (*
 
 FLAC__BitBuffer *FLAC__bitbuffer_new()
 {
-       return (FLAC__BitBuffer*)malloc(sizeof(FLAC__BitBuffer));
+       FLAC__BitBuffer *bb = (FLAC__BitBuffer*)malloc(sizeof(FLAC__BitBuffer));
+
+       if(0 != bb) {
+               memset(bb, 0, sizeof(FLAC__BitBuffer));
+               bb->buffer = 0;
+               bb->capacity = 0;
+               bb->blurbs = bb->bits = bb->total_bits = 0;
+               bb->consumed_blurbs = bb->consumed_bits = bb->total_consumed_bits = 0;
+       }
+       return bb;
 }
 
 void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb)
 {
-       FLAC__ASSERT(bb != 0);
+       FLAC__ASSERT(0 != bb);
 
        FLAC__bitbuffer_free(bb);
        free(bb);
@@ -270,7 +279,7 @@ void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb)
 
 FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb)
 {
-       FLAC__ASSERT(bb != 0);
+       FLAC__ASSERT(0 != bb);
 
        bb->buffer = 0;
        bb->capacity = 0;
@@ -282,7 +291,7 @@ FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb)
 
 FLAC__bool FLAC__bitbuffer_init_from(FLAC__BitBuffer *bb, const FLAC__byte buffer[], unsigned bytes)
 {
-       FLAC__ASSERT(bb != 0);
+       FLAC__ASSERT(0 != bb);
        FLAC__ASSERT(bytes > 0);
 
        if(!FLAC__bitbuffer_init(bb))
@@ -291,7 +300,7 @@ FLAC__bool FLAC__bitbuffer_init_from(FLAC__BitBuffer *bb, const FLAC__byte buffe
        if(!bitbuffer_ensure_size_(bb, bytes << 3))
                return false;
 
-       FLAC__ASSERT(buffer != 0);
+       FLAC__ASSERT(0 != buffer);
        /* @@@ WATCHOUT: code currently only works for 8-bits-per-blurb inclusive-or big-endian: */
        memcpy((FLAC__byte*)bb->buffer, buffer, sizeof(FLAC__byte)*bytes);
        bb->blurbs = bytes / FLAC__BYTES_PER_BLURB;
@@ -304,8 +313,8 @@ FLAC__bool FLAC__bitbuffer_concatenate_aligned(FLAC__BitBuffer *dest, const FLAC
 {
        unsigned bits_to_add = src->total_bits - src->total_consumed_bits;
 
-       FLAC__ASSERT(dest != 0);
-       FLAC__ASSERT(src != 0);
+       FLAC__ASSERT(0 != dest);
+       FLAC__ASSERT(0 != src);
 
        if(bits_to_add == 0)
                return true;
@@ -334,9 +343,9 @@ FLAC__bool FLAC__bitbuffer_concatenate_aligned(FLAC__BitBuffer *dest, const FLAC
 
 void FLAC__bitbuffer_free(FLAC__BitBuffer *bb)
 {
-       FLAC__ASSERT(bb != 0);
+       FLAC__ASSERT(0 != bb);
 
-       if(bb->buffer != 0)
+       if(0 != bb->buffer)
                free(bb->buffer);
        bb->buffer = 0;
        bb->capacity = 0;
@@ -363,10 +372,10 @@ FLAC__bool FLAC__bitbuffer_clear(FLAC__BitBuffer *bb)
 
 FLAC__bool FLAC__bitbuffer_clone(FLAC__BitBuffer *dest, const FLAC__BitBuffer *src)
 {
-       FLAC__ASSERT(dest != 0);
-       FLAC__ASSERT(dest->buffer != 0);
-       FLAC__ASSERT(src != 0);
-       FLAC__ASSERT(src->buffer != 0);
+       FLAC__ASSERT(0 != dest);
+       FLAC__ASSERT(0 != dest->buffer);
+       FLAC__ASSERT(0 != src);
+       FLAC__ASSERT(0 != src->buffer);
 
        if(dest->capacity < src->capacity)
                if(!bitbuffer_resize_(dest, src->capacity))
@@ -384,8 +393,8 @@ FLAC__bool FLAC__bitbuffer_clone(FLAC__BitBuffer *dest, const FLAC__BitBuffer *s
 
 void FLAC__bitbuffer_reset_read_crc16(FLAC__BitBuffer *bb, FLAC__uint16 seed)
 {
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT((bb->consumed_bits & 7) == 0);
 
        bb->read_crc16 = seed;
@@ -400,8 +409,8 @@ void FLAC__bitbuffer_reset_read_crc16(FLAC__BitBuffer *bb, FLAC__uint16 seed)
 
 FLAC__uint16 FLAC__bitbuffer_get_read_crc16(FLAC__BitBuffer *bb)
 {
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT((bb->bits & 7) == 0);
        FLAC__ASSERT((bb->consumed_bits & 7) == 0);
 
@@ -531,8 +540,8 @@ FLAC__bool FLAC__bitbuffer_write_zeroes(FLAC__BitBuffer *bb, unsigned bits)
 {
        unsigned n;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        if(bits == 0)
                return true;
@@ -556,8 +565,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_write_raw_uint32(FLAC__BitBuffer *bb, FL
 {
        unsigned n, k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 32);
        if(bits == 0)
@@ -647,8 +656,8 @@ FLAC__bool FLAC__bitbuffer_write_raw_uint64(FLAC__BitBuffer *bb, FLAC__uint64 va
        };
        unsigned n, k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 64);
        if(bits == 0)
@@ -836,8 +845,8 @@ FLAC__bool FLAC__bitbuffer_write_symmetric_rice_signed(FLAC__BitBuffer *bb, int
        unsigned total_bits, interesting_bits, msbs;
        FLAC__uint32 pattern;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        /* init pattern with the unary end bit and the sign bit */
@@ -875,8 +884,8 @@ FLAC__bool FLAC__bitbuffer_write_symmetric_rice_signed_guarded(FLAC__BitBuffer *
        unsigned total_bits, interesting_bits, msbs;
        FLAC__uint32 pattern;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        *overflow = false;
@@ -920,8 +929,8 @@ FLAC__bool FLAC__bitbuffer_write_symmetric_rice_signed_escape(FLAC__BitBuffer *b
        unsigned total_bits, val_bits;
        FLAC__uint32 pattern;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        val_bits = FLAC__bitmath_silog2(val);
@@ -956,8 +965,8 @@ FLAC__bool FLAC__bitbuffer_write_rice_signed(FLAC__BitBuffer *bb, int val, unsig
        unsigned total_bits, interesting_bits, msbs, uval;
        FLAC__uint32 pattern;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 30);
 
        /* fold signed to unsigned */
@@ -997,8 +1006,8 @@ FLAC__bool FLAC__bitbuffer_write_rice_signed_guarded(FLAC__BitBuffer *bb, int va
        unsigned total_bits, interesting_bits, msbs, uval;
        FLAC__uint32 pattern;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 30);
 
        *overflow = false;
@@ -1045,8 +1054,8 @@ FLAC__bool FLAC__bitbuffer_write_golomb_signed(FLAC__BitBuffer *bb, int val, uns
        unsigned total_bits, msbs, uval;
        unsigned k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter > 0);
 
        /* fold signed to unsigned */
@@ -1113,8 +1122,8 @@ FLAC__bool FLAC__bitbuffer_write_golomb_unsigned(FLAC__BitBuffer *bb, unsigned u
        unsigned total_bits, msbs;
        unsigned k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter > 0);
 
        k = FLAC__bitmath_ilog2(parameter);
@@ -1171,8 +1180,8 @@ FLAC__bool FLAC__bitbuffer_write_utf8_uint32(FLAC__BitBuffer *bb, FLAC__uint32 v
 {
        FLAC__bool ok = 1;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(!(val & 0x80000000)); /* this version only handles 31 bits */
 
@@ -1217,8 +1226,8 @@ FLAC__bool FLAC__bitbuffer_write_utf8_uint64(FLAC__BitBuffer *bb, FLAC__uint64 v
 {
        FLAC__bool ok = 1;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(!(val & 0xFFFFFFF000000000)); /* this version only handles 36 bits */
 
@@ -1280,8 +1289,8 @@ FLAC__bool FLAC__bitbuffer_zero_pad_to_byte_boundary(FLAC__BitBuffer *bb)
 FLAC__bool FLAC__bitbuffer_peek_bit(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
 {
        /* to avoid a drastic speed penalty we don't:
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(bb->bits == 0);
        */
 
@@ -1300,8 +1309,8 @@ FLAC__bool FLAC__bitbuffer_peek_bit(FLAC__BitBuffer *bb, unsigned *val, FLAC__bo
 FLAC__bool FLAC__bitbuffer_read_bit(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
 {
        /* to avoid a drastic speed penalty we don't:
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(bb->bits == 0);
        */
 
@@ -1327,8 +1336,8 @@ FLAC__bool FLAC__bitbuffer_read_bit(FLAC__BitBuffer *bb, unsigned *val, FLAC__bo
 FLAC__bool FLAC__bitbuffer_read_bit_to_uint32(FLAC__BitBuffer *bb, FLAC__uint32 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
 {
        /* to avoid a drastic speed penalty we don't:
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(bb->bits == 0);
        */
 
@@ -1355,8 +1364,8 @@ FLAC__bool FLAC__bitbuffer_read_bit_to_uint32(FLAC__BitBuffer *bb, FLAC__uint32
 FLAC__bool FLAC__bitbuffer_read_bit_to_uint64(FLAC__BitBuffer *bb, FLAC__uint64 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
 {
        /* to avoid a drastic speed penalty we don't:
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(bb->bits == 0);
        */
 
@@ -1385,8 +1394,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_raw_uint32(FLAC__BitBuffer *bb, FLA
 {
        unsigned i;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 32);
 
@@ -1402,8 +1411,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_raw_uint32(FLAC__BitBuffer *bb, FLA
        unsigned i, bits_ = bits;
        FLAC__uint32 v = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 32);
        FLAC__ASSERT((bb->capacity*FLAC__BITS_PER_BLURB) * 2 >= bits);
@@ -1487,8 +1496,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_int32(FLAC__BitBuffer *bb, FLAC__int32 *val,
        unsigned i;
        FLAC__uint32 v;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 32);
 
@@ -1520,8 +1529,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_int32(FLAC__BitBuffer *bb, FLAC__int32 *val,
        unsigned i, bits_ = bits;
        FLAC__uint32 v = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 32);
        FLAC__ASSERT((bb->capacity*FLAC__BITS_PER_BLURB) * 2 >= bits);
@@ -1616,8 +1625,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_uint64(FLAC__BitBuffer *bb, FLAC__uint64 *va
 {
        unsigned i;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 64);
 
@@ -1633,8 +1642,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_uint64(FLAC__BitBuffer *bb, FLAC__uint64 *va
        unsigned i, bits_ = bits;
        FLAC__uint64 v = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 64);
        FLAC__ASSERT((bb->capacity*FLAC__BITS_PER_BLURB) * 2 >= bits);
@@ -1705,8 +1714,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, FLAC__int64 *val,
        unsigned i;
        FLAC__uint64 v;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 64);
 
@@ -1732,8 +1741,8 @@ FLAC__bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, FLAC__int64 *val,
        unsigned i, bits_ = bits;
        FLAC__uint64 v = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        FLAC__ASSERT(bits <= 64);
        FLAC__ASSERT((bb->capacity*FLAC__BITS_PER_BLURB) * 2 >= bits);
@@ -1838,8 +1847,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_raw_uint32_little_endian(FLAC__BitB
 
 FLAC__bool FLAC__bitbuffer_read_byte_block_aligned(FLAC__BitBuffer *bb, FLAC__byte *val, unsigned nvals, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
 {
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(FLAC__bitbuffer_is_byte_aligned(bb));
        FLAC__ASSERT(FLAC__bitbuffer_is_consumed_byte_aligned(bb));
 #if FLAC__BITS_PER_BLURB == 8
@@ -1872,8 +1881,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb,
 {
        unsigned bit, val_ = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        while(1) {
                if(!FLAC__bitbuffer_read_bit(bb, &bit, read_callback, client_data))
@@ -1892,8 +1901,8 @@ FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb,
        unsigned total_blurbs_ = (bb->total_bits + (FLAC__BITS_PER_BLURB-1)) / FLAC__BITS_PER_BLURB;
        FLAC__blurb b;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
 #if FLAC__BITS_PER_BLURB > 8
        if(bb->bits == 0 || bb->consumed_blurbs < bb->blurbs) { /*@@@ comment on why this is here*/
@@ -1975,8 +1984,8 @@ FLAC__bool FLAC__bitbuffer_read_symmetric_rice_signed(FLAC__BitBuffer *bb, int *
 {
        FLAC__uint32 sign = 0, lsbs = 0, msbs = 0;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        /* read the unary MSBs and end bit */
@@ -2005,8 +2014,8 @@ FLAC__bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsig
        FLAC__uint32 lsbs = 0, msbs = 0;
        unsigned uval;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        /* read the unary MSBs and end bit */
@@ -2036,8 +2045,8 @@ FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[
        FLAC__blurb blurb, save_blurb;
        unsigned state = 0; /* 0 = getting unary MSBs, 1 = getting binary LSBs */
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
        FLAC__ASSERT(parameter <= 31);
 
        if(nvals == 0)
@@ -2241,8 +2250,8 @@ FLAC__bool FLAC__bitbuffer_read_golomb_signed(FLAC__BitBuffer *bb, int *val, uns
        FLAC__uint32 lsbs = 0, msbs = 0;
        unsigned bit, uval, k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        k = FLAC__bitmath_ilog2(parameter);
 
@@ -2285,8 +2294,8 @@ FLAC__bool FLAC__bitbuffer_read_golomb_unsigned(FLAC__BitBuffer *bb, unsigned *v
        FLAC__uint32 lsbs, msbs = 0;
        unsigned bit, k;
 
-       FLAC__ASSERT(bb != 0);
-       FLAC__ASSERT(bb->buffer != 0);
+       FLAC__ASSERT(0 != bb);
+       FLAC__ASSERT(0 != bb->buffer);
 
        k = FLAC__bitmath_ilog2(parameter);