Remove casting of return value from *alloc() functions.

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

diff --git a/src/libFLAC/bitwriter.c b/src/libFLAC/bitwriter.c
index 60fb560..651440d 100644 (file)
--- a/src/libFLAC/bitwriter.c
+++ b/src/libFLAC/bitwriter.c
@@ -118,7 +118,7 @@ static FLAC__bool bitwriter_grow_(FLAC__BitWriter *bw, unsigned bits_to_add)
        FLAC__ASSERT(new_capacity > bw->capacity);
        FLAC__ASSERT(new_capacity >= bw->words + ((bw->bits + bits_to_add + FLAC__BITS_PER_WORD - 1) / FLAC__BITS_PER_WORD));
 
-       new_buffer = (bwword*)safe_realloc_mul_2op_(bw->buffer, sizeof(bwword), /*times*/new_capacity);
+       new_buffer = safe_realloc_mul_2op_(bw->buffer, sizeof(bwword), /*times*/new_capacity);
        if(new_buffer == 0)
                return false;
        bw->buffer = new_buffer;
@@ -135,7 +135,7 @@ static FLAC__bool bitwriter_grow_(FLAC__BitWriter *bw, unsigned bits_to_add)
 
 FLAC__BitWriter *FLAC__bitwriter_new(void)
 {
-       FLAC__BitWriter *bw = (FLAC__BitWriter*)calloc(1, sizeof(FLAC__BitWriter));
+       FLAC__BitWriter *bw = calloc(1, sizeof(FLAC__BitWriter));
        /* note that calloc() sets all members to 0 for us */
        return bw;
 }
@@ -160,7 +160,7 @@ FLAC__bool FLAC__bitwriter_init(FLAC__BitWriter *bw)
 
        bw->words = bw->bits = 0;
        bw->capacity = FLAC__BITWRITER_DEFAULT_CAPACITY;
-       bw->buffer = (bwword*)malloc(sizeof(bwword) * bw->capacity);
+       bw->buffer = malloc(sizeof(bwword) * bw->capacity);
        if(bw->buffer == 0)
                return false;