diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-07 14:19:41 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-07 14:19:41 +0000 |
commit | 240464e0ce7ab52b1e3a7159af182968e300247d (patch) | |
tree | 38dd350ade91d51805a3be014e7f140f01295bbd /channels | |
parent | 8f7db2d51b4c473289ef2e3de445802ccc0c084d (diff) |
Merged revisions 121079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r121079 | russell | 2008-06-07 09:18:44 -0500 (Sat, 07 Jun 2008) | 15 lines
Merged revisions 121078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121078 | russell | 2008-06-07 09:10:56 -0500 (Sat, 07 Jun 2008) | 7 lines
Don't run LIST_HEAD_DESTROY on a STATIC list
(closes issue #12807)
Reported by: ys
Patches:
chan_agent_local.diff uploaded by ys (license 281)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121080 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_agent.c | 1 | ||||
-rw-r--r-- | channels/chan_local.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 8d22eadf9..8f05c20af 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2426,7 +2426,6 @@ static int unload_module(void) ast_free(p); } AST_LIST_UNLOCK(&agents); - AST_LIST_HEAD_DESTROY(&agents); return 0; } diff --git a/channels/chan_local.c b/channels/chan_local.c index 747e922fa..f23dc8f2d 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -781,7 +781,6 @@ static int unload_module(void) ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD); } AST_LIST_UNLOCK(&locals); - AST_LIST_HEAD_DESTROY(&locals); } else { ast_log(LOG_WARNING, "Unable to lock the monitor\n"); return -1; |