Commit d5414640 authored by Fabian Müller's avatar Fabian Müller
Browse files

Fix calloc argument order

parent 4f525e44

lib_debug/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int16_t make_dirs( const char *const pathname ) 


    if ( sep != 0 )

    {

        temp = calloc( 1, strlen( pathname ) + 1 );

        temp = calloc( strlen( pathname ) + 1, sizeof( char ) );

        p = pathname;

        while ( ( p = strchr( p, sep ) ) != NULL )

        {

lib_lc3plus/dct4.c

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ void dct4_init(Dct4* dct, int length) 
    int i;

    assert(length <= MAX_LEN);

    dct->length = length;

    dct->twid1  = calloc(sizeof(*dct->twid1), length / 2);

    dct->twid2  = calloc(sizeof(*dct->twid2), length / 2);

    dct->twid1  = calloc(length / 2, sizeof(*dct->twid1));

    dct->twid2  = calloc(length / 2, sizeof(*dct->twid2));

    for (i = 0; i < length / 2; i++) {

        dct->twid1[i] = cexpi(-(LC3_FLOAT)M_PI_LC3PLUS * (i + (LC3_FLOAT)0.25) / length);

        dct->twid2[i] = cexpi(-(LC3_FLOAT)M_PI_LC3PLUS * i / length);

lib_lc3plus/mdct.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void mdct_init(Mdct* mdct, LC3_INT length, LC3_INT frame_dms, LC3_INT fs_idx, LC 
    mdct->length     = length;

    mdct->mem_length = length - mdct->leading_zeros;

    mdct->window     = mdct_window(length, frame_dms, hrmode);

    mdct->mem        = calloc(sizeof(*mdct->mem), mdct->mem_length);

    mdct->mem        = calloc(mdct->mem_length, sizeof(*mdct->mem));

    dct4_init(&mdct->dct, length);

}

lib_util/aeid_file_reader.c

+2 −2
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ ivas_error aeidFileReader_open( 
        return IVAS_ERR_FAILED_FILE_OPEN;

    }



    self = calloc( sizeof( aeidFileReader ), 1 );

    self = calloc( 1, sizeof( aeidFileReader ) );

    self->aeidFile = aeidFile;

    self->file_path = calloc( sizeof( char ), strlen( aeidFilePath ) + 1 );

    self->file_path = calloc( strlen( aeidFilePath ) + 1, sizeof( char ) );

    strcpy( self->file_path, aeidFilePath );



    *aeidReader = self;

lib_util/audio_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ ivas_error AudioFileReader_open( 
    {

        return IVAS_ERR_FAILED_FILE_OPEN;

    }

    self = calloc( sizeof( AudioFileReader ), 1 );

    self = calloc( 1, sizeof( AudioFileReader ) );

    self->samplingRate = 0;

    self->numChannels = 0;