kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

More new memory wrapper work.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke
2006-01-12 16:08:06 +00:00
parent e825a748cf
commit aaa4c9aecc
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_milliwatt.c
View File

@@ -60,7 +60,7 @@ static char digital_milliwatt[] = {0x1e,0x0b,0x0b,0x1e,0x9e,0x8b,0x8b,0x9e} ;
static void *milliwatt_alloc(struct ast_channel *chan, void *params) static void *milliwatt_alloc(struct ast_channel *chan, void *params)
{ {
int *indexp; int *indexp;
indexp = malloc(sizeof(int)); indexp = ast_malloc(sizeof(*indexp));
if (indexp == NULL) return(NULL); if (indexp == NULL) return(NULL);
*indexp = 0; *indexp = 0;
return(indexp); return(indexp);

3
apps/app_page.c
View File

@@ -100,9 +100,8 @@ static void launch_page(struct ast_channel *chan, const char *meetmeopts, const
struct ast_var_t *varptr; struct ast_var_t *varptr;
pthread_t t; pthread_t t;
pthread_attr_t attr; pthread_attr_t attr;
cd = malloc(sizeof(struct calloutdata)); cd = ast_calloc(1, sizeof(*cd));
if (cd) { if (cd) {
memset(cd, 0, sizeof(struct calloutdata));
ast_copy_string(cd->cidnum, chan->cid.cid_num ? chan->cid.cid_num : "", sizeof(cd->cidnum)); 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->cidname, chan->cid.cid_name ? chan->cid.cid_name : "", sizeof(cd->cidname));
ast_copy_string(cd->tech, tech, sizeof(cd->tech)); ast_copy_string(cd->tech, tech, sizeof(cd->tech));

17
apps/app_rpt.c
View File

@@ -1313,7 +1313,7 @@ struct tm localtm;
l = l->next; l = l->next;
continue; continue;
} }
m = malloc(sizeof(struct rpt_link)); m = ast_malloc(sizeof(*m));
if (!m) if (!m)
{ {
ast_log(LOG_WARNING, "Cannot alloc memory on %s\n", mychannel->name); ast_log(LOG_WARNING, "Cannot alloc memory on %s\n", mychannel->name);
@@ -1564,7 +1564,7 @@ struct rpt_tele *tele;
struct rpt_link *mylink = (struct rpt_link *) data; struct rpt_link *mylink = (struct rpt_link *) data;
pthread_attr_t attr; pthread_attr_t attr;
tele = malloc(sizeof(struct rpt_tele)); tele = ast_malloc(sizeof(*tele));
if (!tele) if (!tele)
{ {
ast_log(LOG_WARNING, "Unable to allocate memory\n"); ast_log(LOG_WARNING, "Unable to allocate memory\n");
@@ -1952,13 +1952,12 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1); strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
/* establish call in monitor mode */ /* establish call in monitor mode */
l = malloc(sizeof(struct rpt_link)); l = ast_calloc(1, sizeof(*l));
if (!l){ if (!l){
ast_log(LOG_WARNING, "Unable to malloc\n"); ast_log(LOG_WARNING, "Unable to malloc\n");
return DC_ERROR; return DC_ERROR;
} }
/* zero the silly thing */ /* zero the silly thing */
memset((char *)l,0,sizeof(struct rpt_link));
snprintf(deststr, sizeof(deststr), "IAX2/%s", s1); snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
tele = strchr(deststr,'/'); tele = strchr(deststr,'/');
if (!tele){ if (!tele){
@@ -2066,13 +2065,11 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1); strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
/* establish call in tranceive mode */ /* establish call in tranceive mode */
l = malloc(sizeof(struct rpt_link)); l = ast_calloc(1, sizeof(*l));
if (!l){ if (!l){
ast_log(LOG_WARNING, "Unable to malloc\n"); ast_log(LOG_WARNING, "Unable to malloc\n");
return(DC_ERROR); return(DC_ERROR);
} }
/* zero the silly thing */
memset((char *)l,0,sizeof(struct rpt_link));
l->mode = 1; l->mode = 1;
l->outbound = 1; l->outbound = 1;
strncpy(l->name, digitbuf, MAXNODESTR - 1); strncpy(l->name, digitbuf, MAXNODESTR - 1);
@@ -6017,7 +6014,7 @@ static int rpt_exec(struct ast_channel *chan, void *data)
} }
l=strlen(options)+2; l=strlen(options)+2;
orig_s=malloc(l); orig_s=ast_malloc(l);
if(!orig_s) { if(!orig_s) {
ast_log(LOG_WARNING, "Out of memory\n"); ast_log(LOG_WARNING, "Out of memory\n");
return -1; return -1;
@@ -6229,14 +6226,12 @@ static int rpt_exec(struct ast_channel *chan, void *data)
} else } else
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
/* establish call in tranceive mode */ /* establish call in tranceive mode */
l = malloc(sizeof(struct rpt_link)); l = ast_calloc(1, sizeof(*l));
if (!l) if (!l)
{ {
ast_log(LOG_WARNING, "Unable to malloc\n"); ast_log(LOG_WARNING, "Unable to malloc\n");
pthread_exit(NULL); pthread_exit(NULL);
} }
/* zero the silly thing */
memset((char *)l,0,sizeof(struct rpt_link));
l->mode = 1; l->mode = 1;
strncpy(l->name,b1,MAXNODESTR - 1); strncpy(l->name,b1,MAXNODESTR - 1);
l->isremote = 0; l->isremote = 0;