diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-05-11 20:07:44 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-05-11 20:07:44 +0000 |
commit | f9c578a8a05beb342a4e02648c35b4b2939d11ba (patch) | |
tree | f91bfa1dc51a7b5350dd534e72ed17e37cdd2b25 /pbx.c | |
parent | 126ce7882c857925f24573b4e82fddc888e1ace3 (diff) |
- The recent change to linklists.h broke the build on linux for some reason.
So, I have removed all of the uses of AST_LIST_HEAD_INIT and replaced them
with the equivalent static initializations.
- On passing, fix a memory leak in the unload_module() function of chan_agent.
The agents list mutex was never destroyed, and the elements in the agents
list were not freed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx.c')
-rw-r--r-- | pbx.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -3465,15 +3465,13 @@ AST_LIST_HEAD(store_hints, store_hint); void ast_merge_contexts_and_delete(struct ast_context **extcontexts, const char *registrar) { struct ast_context *tmp, *lasttmp = NULL; - struct store_hints store; + struct store_hints store = AST_LIST_HEAD_INIT_VALUE; struct store_hint *this; struct ast_hint *hint; struct ast_exten *exten; int length; struct ast_state_cb *thiscb, *prevcb; - AST_LIST_HEAD_INIT(&store); - /* it is very important that this function hold the hint list lock _and_ the conlock during its operation; not only do we need to ensure that the list of contexts and extensions does not change, but also that no hint callbacks (watchers) are |