kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

conversions to allocation wrappers and coding guidelines fixes (issue #6592)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-02-27 01:43:42 +00:00
parent 5c38240187
commit 442785f3e2
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
logger.c
View File

@@ -184,14 +184,9 @@ static struct logchannel *make_logchannel(char *channel, char *components, int l
CODE *cptr; CODE *cptr;
#endif #endif
if (ast_strlen_zero(channel)) if (ast_strlen_zero(channel) || !(chan = ast_calloc(1, sizeof(*chan))))
return NULL;
chan = malloc(sizeof(struct logchannel));
if (!chan) /* Can't allocate memory */
return NULL; return NULL;
memset(chan, 0, sizeof(struct logchannel));
if (!strcasecmp(channel, "console")) { if (!strcasecmp(channel, "console")) {
chan->type = LOGTYPE_CONSOLE; chan->type = LOGTYPE_CONSOLE;
} else if (!strncasecmp(channel, "syslog", 6)) { } else if (!strncasecmp(channel, "syslog", 6)) {
@@ -319,8 +314,8 @@ static void init_logger_chain(void)
/* If no config file, we're fine, set default options. */ /* If no config file, we're fine, set default options. */
if (!cfg) { if (!cfg) {
fprintf(stderr, "Unable to open logger.conf: %s\n", strerror(errno)); fprintf(stderr, "Unable to open logger.conf: %s\n", strerror(errno));
chan = malloc(sizeof(struct logchannel)); if (!(chan = ast_calloc(1, sizeof(*chan))))
memset(chan, 0, sizeof(struct logchannel)); return;
chan->type = LOGTYPE_CONSOLE; chan->type = LOGTYPE_CONSOLE;
chan->logmask = 28; /*warning,notice,error */ chan->logmask = 28; /*warning,notice,error */
chan->next = logchannels; chan->next = logchannels;
@@ -821,11 +816,9 @@ void ast_backtrace(void)
void **addresses; void **addresses;
char **strings; char **strings;
addresses = calloc(MAX_BACKTRACE_FRAMES, sizeof(void *)); if ((addresses = ast_calloc(MAX_BACKTRACE_FRAMES, sizeof(*addresses)))) {
if (addresses) {
count = backtrace(addresses, MAX_BACKTRACE_FRAMES); count = backtrace(addresses, MAX_BACKTRACE_FRAMES);
strings = backtrace_symbols(addresses, count); if ((strings = backtrace_symbols(addresses, count))) {
if (strings) {
ast_log(LOG_DEBUG, "Got %d backtrace record%c\n", count, count != 1 ? 's' : ' '); ast_log(LOG_DEBUG, "Got %d backtrace record%c\n", count, count != 1 ? 's' : ' ');
for (i=0; i < count ; i++) { for (i=0; i < count ; i++) {
ast_log(LOG_DEBUG, "#%d: [%08X] %s\n", i, (unsigned int)addresses[i], strings[i]); ast_log(LOG_DEBUG, "#%d: [%08X] %s\n", i, (unsigned int)addresses[i], strings[i]);
@@ -835,8 +828,6 @@ void ast_backtrace(void)
ast_log(LOG_DEBUG, "Could not allocate memory for backtrace\n"); ast_log(LOG_DEBUG, "Could not allocate memory for backtrace\n");
} }
free(addresses); free(addresses);
} else {
ast_log(LOG_DEBUG, "Could not allocate memory for backtrace\n");
} }
#else #else
#ifdef Linux #ifdef Linux
@@ -870,8 +861,7 @@ void ast_verbose(const char *fmt, ...)
time(&t); time(&t);
localtime_r(&t, &tm); localtime_r(&t, &tm);
strftime(date, sizeof(date), dateformat, &tm); strftime(date, sizeof(date), dateformat, &tm);
datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1); if ((datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1))) {
if (datefmt) {
sprintf(datefmt, "[%s] %s", date, fmt); sprintf(datefmt, "[%s] %s", date, fmt);
fmt = datefmt; fmt = datefmt;
} }
@@ -905,7 +895,7 @@ void ast_verbose(const char *fmt, ...)
if (complete) { if (complete) {
if (msgcnt < MAX_MSG_QUEUE) { if (msgcnt < MAX_MSG_QUEUE) {
/* Allocate new structure */ /* Allocate new structure */
if ((m = malloc(sizeof(*m)))) if ((m = ast_malloc(sizeof(*m))))
msgcnt++; msgcnt++;
} else { } else {
/* Recycle the oldest entry */ /* Recycle the oldest entry */
@@ -914,8 +904,7 @@ void ast_verbose(const char *fmt, ...)
free(m->msg); free(m->msg);
} }
if (m) { if (m) {
m->msg = strdup(stuff); if ((m->msg = ast_strdup(stuff))) {
if (m->msg) {
if (last) if (last)
last->next = m; last->next = m;
else else
@@ -924,7 +913,6 @@ void ast_verbose(const char *fmt, ...)
last = m; last = m;
} else { } else {
msgcnt--; msgcnt--;
ast_log(LOG_ERROR, "Out of memory\n");
free(m); free(m);
} }
} }
@@ -964,7 +952,7 @@ int ast_register_verbose(void (*v)(const char *string, int opos, int replacelast
struct msglist *m; struct msglist *m;
struct verb *tmp; struct verb *tmp;
/* XXX Should be more flexible here, taking > 1 verboser XXX */ /* XXX Should be more flexible here, taking > 1 verboser XXX */
if ((tmp = malloc(sizeof (struct verb)))) { if ((tmp = ast_malloc(sizeof(*tmp)))) {
tmp->verboser = v; tmp->verboser = v;
ast_mutex_lock(&msglist_lock); ast_mutex_lock(&msglist_lock);
tmp->next = verboser; tmp->next = verboser;