[svn-commits] trunk - r8381 /trunk/codecs/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Jan 21 01:45:42 MST 2006
Author: russell
Date: Sat Jan 21 02:45:39 2006
New Revision: 8381
URL: http://svn.digium.com/view/asterisk?rev=8381&view=rev
Log:
conversions to use allocation wrappers (issue #6277)
Modified:
trunk/codecs/codec_a_mu.c
trunk/codecs/codec_adpcm.c
trunk/codecs/codec_alaw.c
trunk/codecs/codec_g723_1.c
trunk/codecs/codec_g726.c
trunk/codecs/codec_gsm.c
trunk/codecs/codec_ilbc.c
trunk/codecs/codec_lpc10.c
trunk/codecs/codec_speex.c
trunk/codecs/codec_ulaw.c
Modified: trunk/codecs/codec_a_mu.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_a_mu.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_a_mu.c (original)
+++ trunk/codecs/codec_a_mu.c Sat Jan 21 02:45:39 2006
@@ -41,6 +41,7 @@
#include "asterisk/channel.h"
#include "asterisk/alaw.h"
#include "asterisk/ulaw.h"
+#include "asterisk/utils.h"
#define BUFFER_SIZE 8096 /* size for the translation buffers */
@@ -83,26 +84,26 @@
static struct ast_translator_pvt *alawtoulaw_new(void)
{
struct ulaw_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct ulaw_encoder_pvt));
- if (tmp) {
- memset(tmp, 0, sizeof(*tmp));
+
+ if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
tmp->tail = 0;
localusecnt++;
ast_update_use_count();
}
+
return (struct ast_translator_pvt *)tmp;
}
static struct ast_translator_pvt *ulawtoalaw_new(void)
{
struct alaw_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct alaw_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;
}
Modified: trunk/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_adpcm.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_adpcm.c (original)
+++ trunk/codecs/codec_adpcm.c Sat Jan 21 02:45:39 2006
@@ -45,6 +45,7 @@
#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 @@
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 *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;
}
Modified: trunk/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_alaw.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_alaw.c (original)
+++ trunk/codecs/codec_alaw.c Sat Jan 21 02:45:39 2006
@@ -42,6 +42,7 @@
#include "asterisk/translate.h"
#include "asterisk/channel.h"
#include "asterisk/alaw.h"
+#include "asterisk/utils.h"
#define BUFFER_SIZE 8096 /* size for the translation buffers */
@@ -94,14 +95,14 @@
static struct ast_translator_pvt *alawtolin_new(void)
{
struct alaw_decoder_pvt *tmp;
- tmp = malloc(sizeof(struct alaw_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;
}
@@ -119,13 +120,13 @@
static struct ast_translator_pvt *lintoalaw_new(void)
{
struct alaw_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct alaw_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;
}
Modified: trunk/codecs/codec_g723_1.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_g723_1.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_g723_1.c (original)
+++ trunk/codecs/codec_g723_1.c Sat Jan 21 02:45:39 2006
@@ -50,6 +50,7 @@
#include "asterisk/module.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
#ifdef ANNEX_B
#include "g723.1b/typedef2.h"
@@ -113,9 +114,8 @@
static struct ast_translator_pvt *g723tolin_new(void)
{
- struct g723_decoder_pvt *tmp;
- tmp = malloc(sizeof(struct g723_decoder_pvt));
- if (tmp) {
+ struct g723_decoder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
Init_Decod(&tmp->dec);
Init_Dec_Cng(&tmp->dec);
tmp->tail = 0;
@@ -157,9 +157,8 @@
static struct ast_translator_pvt *lintog723_new(void)
{
- struct g723_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct g723_encoder_pvt));
- if (tmp) {
+ struct g723_encoder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
Init_Coder(&tmp->cod);
/* Init Comfort Noise Functions */
if( UseVx ) {
Modified: trunk/codecs/codec_g726.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_g726.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_g726.c (original)
+++ trunk/codecs/codec_g726.c Sat Jan 21 02:45:39 2006
@@ -45,6 +45,7 @@
#include "asterisk/options.h"
#include "asterisk/translate.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
#define WANT_ASM
#include "log2comp.h"
@@ -734,11 +735,9 @@
static struct ast_translator_pvt *
g726tolin_new (void)
{
- struct g726_decoder_pvt *tmp;
- tmp = malloc (sizeof (struct g726_decoder_pvt));
- if (tmp)
+ struct g726_decoder_pvt *tmp;
+ if ((tmp = ast_calloc(1, sizeof(*tmp))))
{
- memset(tmp, 0, sizeof(*tmp));
tmp->tail = 0;
plc_init(&tmp->plc);
localusecnt++;
@@ -762,11 +761,9 @@
static struct ast_translator_pvt *
lintog726_new (void)
{
- struct g726_encoder_pvt *tmp;
- tmp = malloc (sizeof (struct g726_encoder_pvt));
- if (tmp)
+ struct g726_encoder_pvt *tmp;
+ if ((tmp = ast_calloc(1, sizeof(*tmp))))
{
- memset(tmp, 0, sizeof(*tmp));
localusecnt++;
tmp->tail = 0;
g726_init_state(&tmp->g726);
Modified: trunk/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_gsm.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_gsm.c (original)
+++ trunk/codecs/codec_gsm.c Sat Jan 21 02:45:39 2006
@@ -44,6 +44,7 @@
#include "asterisk/module.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
#ifdef USE_EXTERNAL_GSM_LIB
#include <gsm/gsm.h>
@@ -81,9 +82,8 @@
static struct ast_translator_pvt *gsm_new(void)
{
- struct gsm_coder_pvt *tmp;
- tmp = malloc(sizeof(struct gsm_coder_pvt));
- if (tmp) {
+ struct gsm_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
if (!(tmp->gsm = gsm_create())) {
free(tmp);
tmp = NULL;
Modified: trunk/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_ilbc.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_ilbc.c (original)
+++ trunk/codecs/codec_ilbc.c Sat Jan 21 02:45:39 2006
@@ -41,6 +41,7 @@
#include "asterisk/module.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
#include "ilbc/iLBC_encode.h"
#include "ilbc/iLBC_decode.h"
@@ -76,8 +77,7 @@
static struct ast_translator_pvt *lintoilbc_new(void)
{
struct ilbc_coder_pvt *tmp;
- tmp = malloc(sizeof(struct ilbc_coder_pvt));
- if (tmp) {
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
/* Shut valgrind up */
memset(&tmp->enc, 0, sizeof(tmp->enc));
initEncode(&tmp->enc, ILBC_MS);
@@ -89,9 +89,8 @@
static struct ast_translator_pvt *ilbctolin_new(void)
{
- struct ilbc_coder_pvt *tmp;
- tmp = malloc(sizeof(struct ilbc_coder_pvt));
- if (tmp) {
+ struct ilbc_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
/* Shut valgrind up */
memset(&tmp->dec, 0, sizeof(tmp->dec));
initDecode(&tmp->dec, ILBC_MS, USE_ILBC_ENHANCER);
Modified: trunk/codecs/codec_lpc10.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_lpc10.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_lpc10.c (original)
+++ trunk/codecs/codec_lpc10.c Sat Jan 21 02:45:39 2006
@@ -45,6 +45,7 @@
#include "asterisk/module.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
#include "lpc10/lpc10.h"
@@ -87,9 +88,8 @@
static struct ast_translator_pvt *lpc10_enc_new(void)
{
- struct lpc10_coder_pvt *tmp;
- tmp = malloc(sizeof(struct lpc10_coder_pvt));
- if (tmp) {
+ struct lpc10_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
if (!(tmp->lpc10.enc = create_lpc10_encoder_state())) {
free(tmp);
tmp = NULL;
@@ -103,9 +103,8 @@
static struct ast_translator_pvt *lpc10_dec_new(void)
{
- struct lpc10_coder_pvt *tmp;
- tmp = malloc(sizeof(struct lpc10_coder_pvt));
- if (tmp) {
+ struct lpc10_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
if (!(tmp->lpc10.dec = create_lpc10_decoder_state())) {
free(tmp);
tmp = NULL;
Modified: trunk/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_speex.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_speex.c (original)
+++ trunk/codecs/codec_speex.c Sat Jan 21 02:45:39 2006
@@ -75,6 +75,7 @@
#include "asterisk/options.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
+#include "asterisk/utils.h"
/* Sample frame data */
#include "slin_speex_ex.h"
@@ -111,9 +112,8 @@
static struct ast_translator_pvt *lintospeex_new(void)
{
- struct speex_coder_pvt *tmp;
- tmp = malloc(sizeof(struct speex_coder_pvt));
- if (tmp) {
+ struct speex_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
if (!(tmp->speex = speex_encoder_init(&speex_nb_mode))) {
free(tmp);
tmp = NULL;
@@ -158,9 +158,8 @@
static struct ast_translator_pvt *speextolin_new(void)
{
- struct speex_coder_pvt *tmp;
- tmp = malloc(sizeof(struct speex_coder_pvt));
- if (tmp) {
+ struct speex_coder_pvt *tmp;
+ if ((tmp = ast_malloc(sizeof(*tmp)))) {
if (!(tmp->speex = speex_decoder_init(&speex_nb_mode))) {
free(tmp);
tmp = NULL;
Modified: trunk/codecs/codec_ulaw.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_ulaw.c?rev=8381&r1=8380&r2=8381&view=diff
==============================================================================
--- trunk/codecs/codec_ulaw.c (original)
+++ trunk/codecs/codec_ulaw.c Sat Jan 21 02:45:39 2006
@@ -42,6 +42,7 @@
#include "asterisk/translate.h"
#include "asterisk/channel.h"
#include "asterisk/ulaw.h"
+#include "asterisk/utils.h"
#define BUFFER_SIZE 8096 /* size for the translation buffers */
@@ -96,14 +97,14 @@
static struct ast_translator_pvt *ulawtolin_new(void)
{
struct ulaw_decoder_pvt *tmp;
- tmp = malloc(sizeof(struct ulaw_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;
}
@@ -121,13 +122,13 @@
static struct ast_translator_pvt *lintoulaw_new(void)
{
struct ulaw_encoder_pvt *tmp;
- tmp = malloc(sizeof(struct ulaw_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;
}
More information about the svn-commits
mailing list