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: https://origsvn.digium.com/svn/asterisk/trunk@121079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 8d22eadf9702900c95eb184d38649f0917191c63..8f05c20affb78dceff4c60b8fda9c92ac34af8ea 100644 (file)
--- 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 5d89cac3b34b52ec16d2a76412e2831d121c83bb..d53184462e5406a1f42f1b3ed5a8967a0f1faddf 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -812,7 +812,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;