diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-17 22:24:45 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-17 22:24:45 +0000 |
commit | 05c0b1648b1eb371a95a93945eca07380914dcfb (patch) | |
tree | 8796bfc07201b298a7b085d159b527c2fa5a9fd9 /main | |
parent | b31277825fe8490a59204c7eb05cf1f51a00cf03 (diff) |
Merged revisions 45408 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45408 | kpfleming | 2006-10-17 17:24:10 -0500 (Tue, 17 Oct 2006) | 3 lines
optimize the 'quick response' code a bit more... no more malloc() or memset() for each response
expand stringfields API a bit to allow reusing the stringfield pool on a structure when needed, and remove some unnecessary code when the structure was being freed
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45409 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/ast_expr2.c | 2 | ||||
-rw-r--r-- | main/channel.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 6532093c5..bd152549b 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -142,7 +142,7 @@ #include "asterisk.h" #ifndef STANDALONE -ASTERISK_FILE_VERSION(__FILE__, "$Revision: 40546 $") +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #include <sys/types.h> diff --git a/main/channel.c b/main/channel.c index 605bb5b7e..9a1b6dfca 100644 --- a/main/channel.c +++ b/main/channel.c @@ -654,7 +654,7 @@ struct ast_channel *ast_channel_alloc(int needqueue) if (needqueue) { if (pipe(tmp->alertpipe)) { ast_log(LOG_WARNING, "Channel allocation failed: Can't create alert pipe!\n"); - ast_string_field_free_all(tmp); + ast_string_field_free_pools(tmp); free(tmp); return NULL; } else { @@ -1055,7 +1055,7 @@ void ast_channel_free(struct ast_channel *chan) /* Destroy the jitterbuffer */ ast_jb_destroy(chan); - ast_string_field_free_all(chan); + ast_string_field_free_pools(chan); free(chan); AST_LIST_UNLOCK(&channels); |