diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-03 06:10:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-03 06:10:27 +0000 |
| commit | 017773401f29b879f48ca952ce963dc41259618c (patch) | |
| tree | 47467b33841bb4ba9ac822e234ee2cac2218aef4 /channels/chan_gtalk.c | |
| parent | 9895f3dbd288aaa18d4a11c95af58cee61f27325 (diff) | |
ast_calloc janitor (Inspired by issue 9860)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66981 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index f54a65f07..d27e03109 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -881,7 +881,7 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const tmp->parent = client; if (!tmp->rtp) { ast_log(LOG_WARNING, "Out of RTP sessions?\n"); - free(tmp); + ast_free(tmp); return NULL; } @@ -1600,8 +1600,7 @@ static struct gtalk_candidate *gtalk_create_candidate(char *args) { char *name, *type, *preference, *protocol; struct gtalk_candidate *res; - res = malloc(sizeof(struct gtalk_candidate)); - memset(res, 0, sizeof(struct gtalk_candidate)); + res = ast_calloc(1, sizeof(*res)); if (args) name = args; if ((args = strchr(args, ','))) { @@ -1758,8 +1757,7 @@ static int gtalk_load_config(void) while (cat) { if (strcasecmp(cat, "general")) { var = ast_variable_browse(cfg, cat); - member = (struct gtalk *) malloc(sizeof(struct gtalk)); - memset(member, 0, sizeof(struct gtalk)); + member = ast_calloc(1, sizeof(*member)); ASTOBJ_INIT(member); ASTOBJ_WRLOCK(member); if (!strcasecmp(cat, "guest")) { |