[asterisk-commits] kpfleming: trunk r80508 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Aug 23 12:18:29 2007
New Revision: 80508

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80508
Log:
Merged revisions 80501 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80501 | kpfleming | 2007-08-23 12:08:25 -0500 (Thu, 23 Aug 2007) | 2 lines

report the actual channel number that was unregistered, instead of assuming that the interface list consists of channels 1 through <x> with no gaps in the sequence

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=80508&r1=80507&r2=80508
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Aug 23 12:18:29 2007
@@ -11346,8 +11346,9 @@
 
 static int __unload_module(void)
 {
-	int x = 0;
+	int x;
 	struct zt_pvt *p, *pl;
+
 #ifdef HAVE_PRI
 	int i;
 	for (i = 0; i < NUM_SPANS; i++) {
@@ -11396,7 +11397,7 @@
 			zt_close(p->subs[SUB_REAL].zfd);
 		pl = p;
 		p = p->next;
-		x++;
+		x = pl->channel;
 		/* Free associated memory */
 		if (pl)
 			destroy_zt_pvt(&pl);