aboutsummaryrefslogtreecommitdiffstats
path: root/codecs/codec_adpcm.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-21 08:45:39 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-21 08:45:39 +0000
commit52fb5814943bd6d7d314d8f88dbd71b2c8d61c24 (patch)
tree63ee48c5830529cb1e1026badc6d3695fea22919 /codecs/codec_adpcm.c
parent41cb10c7565fb6d43d5d0c705f422d99d7d152ff (diff)
conversions to use allocation wrappers (issue #6277)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8381 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_adpcm.c')
-rw-r--r--codecs/codec_adpcm.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index e62755074..19fd33c31 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -45,6 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/options.h"
#include "asterisk/translate.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
/* define NOT_BLI to use a faster but not bit-level identical version */
/* #define NOT_BLI */
@@ -268,14 +269,14 @@ struct adpcm_decoder_pvt
static struct ast_translator_pvt *adpcmtolin_new(void)
{
struct adpcm_decoder_pvt *tmp;
- tmp = malloc(sizeof(struct adpcm_decoder_pvt));
- if (tmp) {
- memset(tmp, 0, sizeof(*tmp));
+
+ if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
tmp->tail = 0;
plc_init(&tmp->plc);
localusecnt++;
ast_update_use_count();
}
+
return (struct ast_translator_pvt *)tmp;
}
@@ -293,13 +294,13 @@ static struct ast_translator_pvt *adpcmtolin_new(void)
static struct ast_translator_pvt *lintoadpcm_new(void)
{
struct adpcm_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct adpcm_encoder_pvt));
- if (tmp) {
- memset(tmp, 0, sizeof(*tmp));
+
+ if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
localusecnt++;
ast_update_use_count();
tmp->tail = 0;
}
+
return (struct ast_translator_pvt *)tmp;
}