Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stefan Strogin
flac
Commits
ea7155f0
Commit
ea7155f0
authored
Oct 18, 2002
by
Josh Coalson
Browse files
switch malloc+memset(0) to calloc()
parent
a987ab45
Changes
13
Hide whitespace changes
Inline
Side-by-side
src/libFLAC/bitbuffer.c
View file @
ea7155f0
...
...
@@ -140,10 +140,9 @@ static FLAC__bool bitbuffer_resize_(FLAC__BitBuffer *bb, unsigned new_capacity)
if
(
bb
->
capacity
==
new_capacity
)
return
true
;
new_buffer
=
(
FLAC__blurb
*
)
m
alloc
(
sizeof
(
FLAC__blurb
)
*
new_capacity
);
new_buffer
=
(
FLAC__blurb
*
)
c
alloc
(
new_capacity
,
sizeof
(
FLAC__blurb
));
if
(
new_buffer
==
0
)
return
false
;
memset
(
new_buffer
,
0
,
sizeof
(
FLAC__blurb
)
*
new_capacity
);
memcpy
(
new_buffer
,
bb
->
buffer
,
sizeof
(
FLAC__blurb
)
*
min
(
bb
->
blurbs
+
(
bb
->
bits
?
1
:
0
),
new_capacity
));
if
(
new_capacity
<
bb
->
blurbs
+
(
bb
->
bits
?
1
:
0
))
{
bb
->
blurbs
=
new_capacity
;
...
...
@@ -251,15 +250,15 @@ static FLAC__bool bitbuffer_read_from_client_(FLAC__BitBuffer *bb, FLAC__bool (*
FLAC__BitBuffer
*
FLAC__bitbuffer_new
()
{
FLAC__BitBuffer
*
bb
=
(
FLAC__BitBuffer
*
)
m
alloc
(
sizeof
(
FLAC__BitBuffer
));
FLAC__BitBuffer
*
bb
=
(
FLAC__BitBuffer
*
)
c
alloc
(
1
,
sizeof
(
FLAC__BitBuffer
));
if
(
0
!=
bb
)
{
/* calloc() implies:
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
;
}
...
...
@@ -357,10 +356,9 @@ FLAC__bool FLAC__bitbuffer_clear(FLAC__BitBuffer *bb)
{
if
(
bb
->
buffer
==
0
)
{
bb
->
capacity
=
FLAC__BITBUFFER_DEFAULT_CAPACITY
;
bb
->
buffer
=
(
FLAC__blurb
*
)
m
alloc
(
sizeof
(
FLAC__blurb
)
*
bb
->
capacity
);
bb
->
buffer
=
(
FLAC__blurb
*
)
c
alloc
(
bb
->
capacity
,
sizeof
(
FLAC__blurb
));
if
(
bb
->
buffer
==
0
)
return
false
;
memset
(
bb
->
buffer
,
0
,
bb
->
capacity
);
}
else
{
memset
(
bb
->
buffer
,
0
,
bb
->
blurbs
+
(
bb
->
bits
?
1
:
0
));
...
...
src/libFLAC/file_decoder.c
View file @
ea7155f0
...
...
@@ -96,26 +96,23 @@ FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__FileDecoder
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoder
));
decoder
=
(
FLAC__FileDecoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
FLAC__FileDecoder
));
decoder
->
protected_
=
(
FLAC__FileDecoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoderProtected
));
decoder
->
protected_
=
(
FLAC__FileDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
FLAC__FileDecoderProtected
));
decoder
->
private_
=
(
FLAC__FileDecoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoderPrivate
));
decoder
->
private_
=
(
FLAC__FileDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
FLAC__FileDecoderPrivate
));
decoder
->
private_
->
seekable_stream_decoder
=
FLAC__seekable_stream_decoder_new
();
if
(
0
==
decoder
->
private_
->
seekable_stream_decoder
)
{
...
...
src/libFLAC/file_encoder.c
View file @
ea7155f0
...
...
@@ -86,26 +86,23 @@ FLAC_API FLAC__FileEncoder *FLAC__file_encoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
encoder
=
(
FLAC__FileEncoder
*
)
m
alloc
(
sizeof
(
FLAC__FileEncoder
));
encoder
=
(
FLAC__FileEncoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileEncoder
));
if
(
encoder
==
0
)
{
return
0
;
}
memset
(
encoder
,
0
,
sizeof
(
FLAC__FileEncoder
));
encoder
->
protected_
=
(
FLAC__FileEncoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__FileEncoderProtected
));
encoder
->
protected_
=
(
FLAC__FileEncoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileEncoderProtected
));
if
(
encoder
->
protected_
==
0
)
{
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
protected_
,
0
,
sizeof
(
FLAC__FileEncoderProtected
));
encoder
->
private_
=
(
FLAC__FileEncoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__FileEncoderPrivate
));
encoder
->
private_
=
(
FLAC__FileEncoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileEncoderPrivate
));
if
(
encoder
->
private_
==
0
)
{
free
(
encoder
->
protected_
);
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
private_
,
0
,
sizeof
(
FLAC__FileEncoderPrivate
));
encoder
->
private_
->
seekable_stream_encoder
=
FLAC__seekable_stream_encoder_new
();
if
(
0
==
encoder
->
private_
->
seekable_stream_encoder
)
{
...
...
src/libFLAC/metadata_iterators.c
View file @
ea7155f0
...
...
@@ -242,7 +242,7 @@ FLAC_API const char * const FLAC__Metadata_SimpleIteratorStatusString[] = {
FLAC_API
FLAC__Metadata_SimpleIterator
*
FLAC__metadata_simple_iterator_new
()
{
FLAC__Metadata_SimpleIterator
*
iterator
=
m
alloc
(
sizeof
(
FLAC__Metadata_SimpleIterator
));
FLAC__Metadata_SimpleIterator
*
iterator
=
c
alloc
(
1
,
sizeof
(
FLAC__Metadata_SimpleIterator
));
if
(
0
!=
iterator
)
{
iterator
->
file
=
0
;
...
...
@@ -748,10 +748,7 @@ FLAC_API const char * const FLAC__Metadata_ChainStatusString[] = {
static
FLAC__Metadata_Node
*
node_new_
()
{
FLAC__Metadata_Node
*
node
=
(
FLAC__Metadata_Node
*
)
malloc
(
sizeof
(
FLAC__Metadata_Node
));
if
(
0
!=
node
)
memset
(
node
,
0
,
sizeof
(
FLAC__Metadata_Node
));
return
node
;
return
(
FLAC__Metadata_Node
*
)
calloc
(
1
,
sizeof
(
FLAC__Metadata_Node
));
}
static
void
node_delete_
(
FLAC__Metadata_Node
*
node
)
...
...
@@ -888,7 +885,7 @@ static FLAC__bool chain_merge_adjacent_padding_(FLAC__Metadata_Chain *chain, FLA
FLAC_API
FLAC__Metadata_Chain
*
FLAC__metadata_chain_new
()
{
FLAC__Metadata_Chain
*
chain
=
m
alloc
(
sizeof
(
FLAC__Metadata_Chain
));
FLAC__Metadata_Chain
*
chain
=
c
alloc
(
1
,
sizeof
(
FLAC__Metadata_Chain
));
if
(
0
!=
chain
)
{
chain
->
filename
=
0
;
...
...
@@ -1102,12 +1099,12 @@ FLAC_API void FLAC__metadata_chain_sort_padding(FLAC__Metadata_Chain *chain)
FLAC_API
FLAC__Metadata_Iterator
*
FLAC__metadata_iterator_new
()
{
FLAC__Metadata_Iterator
*
iterator
=
m
alloc
(
sizeof
(
FLAC__Metadata_Iterator
));
FLAC__Metadata_Iterator
*
iterator
=
c
alloc
(
1
,
sizeof
(
FLAC__Metadata_Iterator
));
if
(
0
!=
iterator
)
{
/* calloc() implies:
iterator->current = 0;
iterator->chain = 0;
}
*/
return
iterator
;
}
...
...
src/libFLAC/metadata_object.c
View file @
ea7155f0
...
...
@@ -111,16 +111,9 @@ static void vorbiscomment_calculate_length_(FLAC__StreamMetadata *object)
static
FLAC__StreamMetadata_VorbisComment_Entry
*
vorbiscomment_entry_array_new_
(
unsigned
num_comments
)
{
FLAC__StreamMetadata_VorbisComment_Entry
*
object_array
;
FLAC__ASSERT
(
num_comments
>
0
);
object_array
=
malloc
(
num_comments
*
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
));
if
(
0
!=
object_array
)
memset
(
object_array
,
0
,
num_comments
*
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
));
return
object_array
;
return
calloc
(
num_comments
,
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
));
}
static
void
vorbiscomment_entry_array_delete_
(
FLAC__StreamMetadata_VorbisComment_Entry
*
object_array
,
unsigned
num_comments
)
...
...
@@ -204,9 +197,8 @@ static FLAC__bool vorbiscomment_set_entry_(FLAC__StreamMetadata *object, FLAC__S
FLAC_API
FLAC__StreamMetadata
*
FLAC__metadata_object_new
(
FLAC__MetadataType
type
)
{
FLAC__StreamMetadata
*
object
=
m
alloc
(
sizeof
(
FLAC__StreamMetadata
));
FLAC__StreamMetadata
*
object
=
c
alloc
(
1
,
sizeof
(
FLAC__StreamMetadata
));
if
(
0
!=
object
)
{
memset
(
object
,
0
,
sizeof
(
FLAC__StreamMetadata
));
object
->
is_last
=
false
;
object
->
type
=
type
;
switch
(
type
)
{
...
...
src/libFLAC/seekable_stream_decoder.c
View file @
ea7155f0
...
...
@@ -18,7 +18,7 @@
*/
#include
<stdio.h>
#include
<stdlib.h>
/* for
m
alloc() */
#include
<stdlib.h>
/* for
c
alloc() */
#include
<string.h>
/* for memcpy()/memcmp() */
#include
"FLAC/assert.h"
#include
"protected/seekable_stream_decoder.h"
...
...
@@ -121,26 +121,23 @@ FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__SeekableStreamDecoder
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoder
));
decoder
=
(
FLAC__SeekableStreamDecoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
FLAC__SeekableStreamDecoder
));
decoder
->
protected_
=
(
FLAC__SeekableStreamDecoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
decoder
->
protected_
=
(
FLAC__SeekableStreamDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
decoder
->
private_
=
(
FLAC__SeekableStreamDecoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
decoder
->
private_
=
(
FLAC__SeekableStreamDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
decoder
->
private_
->
stream_decoder
=
FLAC__stream_decoder_new
();
if
(
0
==
decoder
->
private_
->
stream_decoder
)
{
...
...
src/libFLAC/seekable_stream_encoder.c
View file @
ea7155f0
...
...
@@ -18,7 +18,7 @@
*/
#include
<stdio.h>
#include
<stdlib.h>
/* for
m
alloc() */
#include
<stdlib.h>
/* for
c
alloc() */
#include
<string.h>
/* for memcpy() */
#include
"FLAC/assert.h"
#include
"protected/seekable_stream_encoder.h"
...
...
@@ -99,26 +99,23 @@ FLAC_API FLAC__SeekableStreamEncoder *FLAC__seekable_stream_encoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
encoder
=
(
FLAC__SeekableStreamEncoder
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamEncoder
));
encoder
=
(
FLAC__SeekableStreamEncoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamEncoder
));
if
(
encoder
==
0
)
{
return
0
;
}
memset
(
encoder
,
0
,
sizeof
(
FLAC__SeekableStreamEncoder
));
encoder
->
protected_
=
(
FLAC__SeekableStreamEncoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamEncoderProtected
));
encoder
->
protected_
=
(
FLAC__SeekableStreamEncoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamEncoderProtected
));
if
(
encoder
->
protected_
==
0
)
{
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
protected_
,
0
,
sizeof
(
FLAC__SeekableStreamEncoderProtected
));
encoder
->
private_
=
(
FLAC__SeekableStreamEncoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamEncoderPrivate
));
encoder
->
private_
=
(
FLAC__SeekableStreamEncoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamEncoderPrivate
));
if
(
encoder
->
private_
==
0
)
{
free
(
encoder
->
protected_
);
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
private_
,
0
,
sizeof
(
FLAC__SeekableStreamEncoderPrivate
));
encoder
->
private_
->
stream_encoder
=
FLAC__stream_encoder_new
();
if
(
0
==
encoder
->
private_
->
stream_encoder
)
{
...
...
src/libFLAC/stream_decoder.c
View file @
ea7155f0
...
...
@@ -150,26 +150,23 @@ FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__StreamDecoder
*
)
m
alloc
(
sizeof
(
FLAC__StreamDecoder
));
decoder
=
(
FLAC__StreamDecoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
FLAC__StreamDecoder
));
decoder
->
protected_
=
(
FLAC__StreamDecoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__StreamDecoderProtected
));
decoder
->
protected_
=
(
FLAC__StreamDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
FLAC__StreamDecoderProtected
));
decoder
->
private_
=
(
FLAC__StreamDecoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__StreamDecoderPrivate
));
decoder
->
private_
=
(
FLAC__StreamDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
FLAC__StreamDecoderPrivate
));
decoder
->
private_
->
input
=
FLAC__bitbuffer_new
();
if
(
decoder
->
private_
->
input
==
0
)
{
...
...
src/libFLAC/stream_encoder.c
View file @
ea7155f0
...
...
@@ -430,26 +430,23 @@ FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
encoder
=
(
FLAC__StreamEncoder
*
)
m
alloc
(
sizeof
(
FLAC__StreamEncoder
));
encoder
=
(
FLAC__StreamEncoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamEncoder
));
if
(
encoder
==
0
)
{
return
0
;
}
memset
(
encoder
,
0
,
sizeof
(
FLAC__StreamEncoder
));
encoder
->
protected_
=
(
FLAC__StreamEncoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__StreamEncoderProtected
));
encoder
->
protected_
=
(
FLAC__StreamEncoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamEncoderProtected
));
if
(
encoder
->
protected_
==
0
)
{
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
protected_
,
0
,
sizeof
(
FLAC__StreamEncoderProtected
));
encoder
->
private_
=
(
FLAC__StreamEncoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__StreamEncoderPrivate
));
encoder
->
private_
=
(
FLAC__StreamEncoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__StreamEncoderPrivate
));
if
(
encoder
->
private_
==
0
)
{
free
(
encoder
->
protected_
);
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
private_
,
0
,
sizeof
(
FLAC__StreamEncoderPrivate
));
encoder
->
private_
->
frame
=
FLAC__bitbuffer_new
();
if
(
encoder
->
private_
->
frame
==
0
)
{
...
...
src/libOggFLAC/file_decoder.c
View file @
ea7155f0
...
...
@@ -96,26 +96,23 @@ OggFLAC_API FLAC__FileDecoder *FLAC__file_decoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__FileDecoder
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoder
));
decoder
=
(
FLAC__FileDecoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
FLAC__FileDecoder
));
decoder
->
protected_
=
(
FLAC__FileDecoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoderProtected
));
decoder
->
protected_
=
(
FLAC__FileDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
FLAC__FileDecoderProtected
));
decoder
->
private_
=
(
FLAC__FileDecoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__FileDecoderPrivate
));
decoder
->
private_
=
(
FLAC__FileDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__FileDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
FLAC__FileDecoderPrivate
));
decoder
->
private_
->
seekable_stream_decoder
=
FLAC__seekable_stream_decoder_new
();
if
(
0
==
decoder
->
private_
->
seekable_stream_decoder
)
{
...
...
src/libOggFLAC/seekable_stream_decoder.c
View file @
ea7155f0
...
...
@@ -18,7 +18,7 @@
*/
#include
<stdio.h>
#include
<stdlib.h>
/* for
m
alloc() */
#include
<stdlib.h>
/* for
c
alloc() */
#include
<string.h>
/* for memcpy()/memcmp() */
#include
"FLAC/assert.h"
#include
"protected/seekable_stream_decoder.h"
...
...
@@ -121,26 +121,23 @@ OggFLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new()
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__SeekableStreamDecoder
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoder
));
decoder
=
(
FLAC__SeekableStreamDecoder
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
FLAC__SeekableStreamDecoder
));
decoder
->
protected_
=
(
FLAC__SeekableStreamDecoderProtected
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
decoder
->
protected_
=
(
FLAC__SeekableStreamDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
FLAC__SeekableStreamDecoderProtected
));
decoder
->
private_
=
(
FLAC__SeekableStreamDecoderPrivate
*
)
m
alloc
(
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
decoder
->
private_
=
(
FLAC__SeekableStreamDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
FLAC__SeekableStreamDecoderPrivate
));
decoder
->
private_
->
stream_decoder
=
FLAC__stream_decoder_new
();
if
(
0
==
decoder
->
private_
->
stream_decoder
)
{
...
...
src/libOggFLAC/stream_decoder.c
View file @
ea7155f0
...
...
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
#include
<stdlib.h>
#include
<stdlib.h>
/* for calloc() */
#include
<string.h>
/* for memset() */
#include
"ogg/ogg.h"
#include
"FLAC/assert.h"
...
...
@@ -88,26 +88,23 @@ OggFLAC_API OggFLAC__StreamDecoder *OggFLAC__stream_decoder_new()
{
OggFLAC__StreamDecoder
*
decoder
;
decoder
=
(
OggFLAC__StreamDecoder
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamDecoder
));
decoder
=
(
OggFLAC__StreamDecoder
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
memset
(
decoder
,
0
,
sizeof
(
OggFLAC__StreamDecoder
));
decoder
->
protected_
=
(
OggFLAC__StreamDecoderProtected
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamDecoderProtected
));
decoder
->
protected_
=
(
OggFLAC__StreamDecoderProtected
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
protected_
,
0
,
sizeof
(
OggFLAC__StreamDecoderProtected
));
decoder
->
private_
=
(
OggFLAC__StreamDecoderPrivate
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamDecoderPrivate
));
decoder
->
private_
=
(
OggFLAC__StreamDecoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
return
0
;
}
memset
(
decoder
->
private_
,
0
,
sizeof
(
OggFLAC__StreamDecoderPrivate
));
decoder
->
private_
->
FLAC_stream_decoder
=
FLAC__stream_decoder_new
();
if
(
0
==
decoder
->
private_
->
FLAC_stream_decoder
)
{
...
...
src/libOggFLAC/stream_encoder.c
View file @
ea7155f0
...
...
@@ -18,7 +18,7 @@
*/
#include
<stdio.h>
#include
<stdlib.h>
/* for
m
alloc() */
#include
<stdlib.h>
/* for
c
alloc() */
#include
<string.h>
/* for memcpy() */
#include
"ogg/ogg.h"
#include
"FLAC/assert.h"
...
...
@@ -87,26 +87,23 @@ OggFLAC_API OggFLAC__StreamEncoder *OggFLAC__stream_encoder_new()
{
OggFLAC__StreamEncoder
*
encoder
;
encoder
=
(
OggFLAC__StreamEncoder
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamEncoder
));
encoder
=
(
OggFLAC__StreamEncoder
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamEncoder
));
if
(
encoder
==
0
)
{
return
0
;
}
memset
(
encoder
,
0
,
sizeof
(
OggFLAC__StreamEncoder
));
encoder
->
protected_
=
(
OggFLAC__StreamEncoderProtected
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamEncoderProtected
));
encoder
->
protected_
=
(
OggFLAC__StreamEncoderProtected
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamEncoderProtected
));
if
(
encoder
->
protected_
==
0
)
{
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
protected_
,
0
,
sizeof
(
OggFLAC__StreamEncoderProtected
));
encoder
->
private_
=
(
OggFLAC__StreamEncoderPrivate
*
)
m
alloc
(
sizeof
(
OggFLAC__StreamEncoderPrivate
));
encoder
->
private_
=
(
OggFLAC__StreamEncoderPrivate
*
)
c
alloc
(
1
,
sizeof
(
OggFLAC__StreamEncoderPrivate
));
if
(
encoder
->
private_
==
0
)
{
free
(
encoder
->
protected_
);
free
(
encoder
);
return
0
;
}
memset
(
encoder
->
private_
,
0
,
sizeof
(
OggFLAC__StreamEncoderPrivate
));
encoder
->
private_
->
FLAC_stream_encoder
=
FLAC__stream_encoder_new
();
if
(
0
==
encoder
->
private_
->
FLAC_stream_encoder
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment