[svn-commits] trunk - r8045 /trunk/apps/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Jan 12 21:34:33 CST 2006
Author: bweschke
Date: Thu Jan 12 21:34:31 2006
New Revision: 8045
URL: http://svn.digium.com/view/asterisk?rev=8045&view=rev
Log:
More memory wrapper cleanup. #6224
Modified:
trunk/apps/app_festival.c
trunk/apps/app_meetme.c
trunk/apps/app_milliwatt.c
trunk/apps/app_mixmonitor.c
trunk/apps/app_page.c
trunk/apps/app_parkandannounce.c
Modified: trunk/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_festival.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_festival.c (original)
+++ trunk/apps/app_festival.c Thu Jan 12 21:34:31 2006
@@ -86,7 +86,10 @@
char c;
bufflen = 1024;
- buff = (char *)malloc(bufflen);
+ if (!(buff = ast_malloc(bufflen)))
+ {
+ /* TODO: Handle memory allocation failure */
+ }
*size=0;
for (k=0; file_stuff_key[k] != '\0';)
@@ -96,7 +99,10 @@
if ((*size)+k+1 >= bufflen)
{ /* +1 so you can add a NULL if you want */
bufflen += bufflen/4;
- buff = (char *)realloc(buff,bufflen);
+ if (!(buff = ast_realloc(buff, bufflen)))
+ {
+ /* TODO: Handle memory allocation failure */
+ }
}
if (file_stuff_key[k] == c)
k++;
Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Jan 12 21:34:31 2006
@@ -474,8 +474,7 @@
if (!cnf && (make || dynamic)) {
/* Make a new one */
- cnf = calloc(1, sizeof(*cnf));
- if (cnf) {
+ if ((cnf = ast_calloc(1, sizeof(*cnf)))) {
ast_mutex_init(&cnf->playlock);
ast_mutex_init(&cnf->listenlock);
ast_copy_string(cnf->confno, confno, sizeof(cnf->confno));
@@ -535,8 +534,7 @@
ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno);
cnf->next = confs;
confs = cnf;
- } else
- ast_log(LOG_WARNING, "Out of memory\n");
+ }
}
cnfout:
ast_mutex_unlock(&conflock);
@@ -851,7 +849,7 @@
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags)
{
- struct ast_conf_user *user = calloc(1, sizeof(*user));
+ struct ast_conf_user *user = NULL;
struct ast_conf_user *usr = NULL;
int fd;
struct zt_confinfo ztc, ztc_empty;
@@ -887,9 +885,8 @@
ZT_BUFFERINFO bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
-
- if (!user) {
- ast_log(LOG_ERROR, "Out of memory\n");
+
+ if (!(user = ast_calloc(1, sizeof(*user)))) {
return ret;
}
Modified: trunk/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_milliwatt.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_milliwatt.c (original)
+++ trunk/apps/app_milliwatt.c Thu Jan 12 21:34:31 2006
@@ -41,6 +41,7 @@
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
+#include "asterisk/utils.h"
static char *tdesc = "Digital Milliwatt (mu-law) Test Application";
@@ -59,11 +60,7 @@
static void *milliwatt_alloc(struct ast_channel *chan, void *params)
{
-int *indexp;
- indexp = ast_malloc(sizeof(*indexp));
- if (indexp == NULL) return(NULL);
- *indexp = 0;
- return(indexp);
+ return ast_calloc(1, sizeof(int));
}
static void milliwatt_release(struct ast_channel *chan, void *data)
Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Thu Jan 12 21:34:31 2006
@@ -53,6 +53,7 @@
#include "asterisk/options.h"
#include "asterisk/app.h"
#include "asterisk/linkedlists.h"
+#include "asterisk/utils.h"
#define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
@@ -292,8 +293,7 @@
if (!ast_strlen_zero(post_process))
len += strlen(post_process) + 1;
- if (!(mixmonitor = calloc(1, len))) {
- ast_log(LOG_ERROR, "Memory Error!\n");
+ if (!(mixmonitor = ast_calloc(1, len))) {
return;
}
Modified: trunk/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_page.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_page.c (original)
+++ trunk/apps/app_page.c Thu Jan 12 21:34:31 2006
@@ -43,7 +43,7 @@
#include "asterisk/file.h"
#include "asterisk/app.h"
#include "asterisk/chanvars.h"
-
+#include "asterisk/utils.h"
static const char *tdesc = "Page Multiple Phones";
@@ -100,8 +100,7 @@
struct ast_var_t *varptr;
pthread_t t;
pthread_attr_t attr;
- cd = ast_calloc(1, sizeof(*cd));
- if (cd) {
+ if ((cd = ast_calloc(1, sizeof(*cd)))) {
ast_copy_string(cd->cidnum, chan->cid.cid_num ? chan->cid.cid_num : "", sizeof(cd->cidnum));
ast_copy_string(cd->cidname, chan->cid.cid_name ? chan->cid.cid_name : "", sizeof(cd->cidname));
ast_copy_string(cd->tech, tech, sizeof(cd->tech));
Modified: trunk/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_parkandannounce.c?rev=8045&r1=8044&r2=8045&view=diff
==============================================================================
--- trunk/apps/app_parkandannounce.c (original)
+++ trunk/apps/app_parkandannounce.c Thu Jan 12 21:34:31 2006
@@ -49,6 +49,7 @@
#include "asterisk/logger.h"
#include "asterisk/say.h"
#include "asterisk/lock.h"
+#include "asterisk/utils.h"
static char *tdesc = "Call Parking and Announce Application";
@@ -94,10 +95,8 @@
LOCAL_USER_ADD(u);
- l=strlen(data)+2;
- orig_s=malloc(l);
- if(!orig_s) {
- ast_log(LOG_WARNING, "Out of memory\n");
+ l=strlen(data)+2;
+ if (!(orig_s = ast_malloc(l))) {
LOCAL_USER_REMOVE(u);
return -1;
}
More information about the svn-commits
mailing list