diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-12 20:05:13 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-12 20:05:13 +0000 |
commit | 8a1ce32239018edfd9121702ab188fe5e8255e79 (patch) | |
tree | f8aa0b67d4d3deb1083bc7755af0c48172f86f48 /main | |
parent | 15dae4e59842d3afb286f03599a199209ad3e185 (diff) |
Conversions of free to ast_free, where applicable, and several other formatting fixes.
Reported by: eliel
Patch by: eliel,tilghman
(Closes issue #11209)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92594 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/logger.c | 14 | ||||
-rw-r--r-- | main/utils.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/logger.c b/main/logger.c index eb7ceebc6..a1769f2e7 100644 --- a/main/logger.c +++ b/main/logger.c @@ -285,7 +285,7 @@ static struct logchannel *make_logchannel(const char *channel, const char *compo if (0 > chan->facility) { fprintf(stderr, "Logger Warning: bad syslog facility in logger.conf\n"); - free(chan); + ast_free(chan); return NULL; } @@ -332,7 +332,7 @@ static void init_logger_chain(int reload, int locked) if (!locked) AST_RWLIST_WRLOCK(&logchannels); while ((chan = AST_RWLIST_REMOVE_HEAD(&logchannels, list))) - free(chan); + ast_free(chan); if (!locked) AST_RWLIST_UNLOCK(&logchannels); @@ -882,7 +882,7 @@ static void *logger_thread(void *data) logger_print_verbose(msg); /* Free the data since we are done */ - free(msg); + ast_free(msg); } /* If we should stop, then stop */ @@ -1060,7 +1060,7 @@ void ast_log(int level, const char *file, int line, const char *function, const AST_LIST_UNLOCK(&logmsgs); } else { logger_print_normal(logmsg); - free(logmsg); + ast_free(logmsg); } return; @@ -1089,7 +1089,7 @@ void ast_backtrace(void) } else { ast_debug(1, "Could not allocate memory for backtrace\n"); } - free(addresses); + ast_free(addresses); } #else ast_log(LOG_WARNING, "Must run configure with '--enable-dev-mode' for stack backtraces.\n"); @@ -1150,7 +1150,7 @@ void ast_verbose(const char *fmt, ...) AST_LIST_UNLOCK(&logmsgs); } else { logger_print_verbose(logmsg); - free(logmsg); + ast_free(logmsg); } } @@ -1178,7 +1178,7 @@ int ast_unregister_verbose(void (*v)(const char *string)) AST_RWLIST_TRAVERSE_SAFE_BEGIN(&verbosers, cur, list) { if (cur->verboser == v) { AST_RWLIST_REMOVE_CURRENT(list); - free(cur); + ast_free(cur); break; } } diff --git a/main/utils.c b/main/utils.c index ddd5f0efd..4b244c47b 100644 --- a/main/utils.c +++ b/main/utils.c @@ -790,7 +790,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_ ast_cli(a->fd, "%s", str->str); - free(str); + ast_free(str); return CLI_SUCCESS; } |