From e13567b0c92bb29879cd02318b80385b713cf66d Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 9 Feb 2006 02:08:04 +0000 Subject: various code cleanup changes including changing #define'd constants to enums, comments to doxygen style, memory allocation to use ast_ wrappers, use calloc instead of malloc+memset, and removing duplicated error messages (issue #6435) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9259 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- enum.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index a49e308d8..86b269f44 100644 --- a/enum.c +++ b/enum.c @@ -347,7 +347,7 @@ static int txt_callback(void *context, char *answer, int len, char *fullanswer) /*! \brief Callback from ENUM lookup function */ static int enum_callback(void *context, char *answer, int len, char *fullanswer) { - struct enum_context *c = (struct enum_context *)context; + struct enum_context *c = context; void *p = NULL; int res; @@ -361,10 +361,9 @@ static int enum_callback(void *context, char *answer, int len, char *fullanswer) c->position++; snprintf(c->dst, c->dstlen, "%d", c->position); } else { - p = realloc(c->naptr_rrs, sizeof(struct enum_naptr_rr)*(c->naptr_rrs_count+1)); - if (p) { - c->naptr_rrs = (struct enum_naptr_rr*)p; - memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(struct naptr)); + if ((p = ast_realloc(c->naptr_rrs, sizeof(*c->naptr_rrs) * (c->naptr_rrs_count + 1)))) { + c->naptr_rrs = p; + memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(c->naptr_rrs->naptr)); /* printf("order=%d, pref=%d\n", ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.order), ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.pref)); */ c->naptr_rrs[c->naptr_rrs_count].result = strdup(c->dst); c->naptr_rrs[c->naptr_rrs_count].tech = strdup(c->tech); @@ -613,9 +612,7 @@ static struct enum_search *enum_newtoplev(char *s) { struct enum_search *tmp; - tmp = malloc(sizeof(struct enum_search)); - if (tmp) { - memset(tmp, 0, sizeof(struct enum_search)); + if ((tmp = ast_calloc(1, sizeof(*tmp)))) { ast_copy_string(tmp->toplev, s, sizeof(tmp->toplev)); } return tmp; -- cgit v1.2.3