[asterisk-commits] russell: branch 1.6.0 r121080 - in /branches/1.6.0: ./ channels/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jun  7 09:19:41 2008
New Revision: 121080

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121080
Log:
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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_agent.c
    branches/1.6.0/channels/chan_local.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_agent.c?view=diff&rev=121080&r1=121079&r2=121080
==============================================================================
--- branches/1.6.0/channels/chan_agent.c (original)
+++ branches/1.6.0/channels/chan_agent.c Sat Jun  7 09:19:41 2008
@@ -2426,7 +2426,6 @@
 		ast_free(p);
 	}
 	AST_LIST_UNLOCK(&agents);
-	AST_LIST_HEAD_DESTROY(&agents);
 	return 0;
 }
 

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=121080&r1=121079&r2=121080
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Sat Jun  7 09:19:41 2008
@@ -781,7 +781,6 @@
 				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;