[svn-commits] kpfleming: branch 1.4 r3686 - in /branches/1.4: tonezone.c ztcfg.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Jan 14 12:30:53 2008
New Revision: 3686

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3686
Log:
make ztcfg able to tolerate tone zones already being loaded and selected as default (or in use by channels) without aborting the configuration process

Modified:
    branches/1.4/tonezone.c
    branches/1.4/ztcfg.c

Modified: branches/1.4/tonezone.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/tonezone.c?view=diff&rev=3686&r1=3685&r2=3686
==============================================================================
--- branches/1.4/tonezone.c (original)
+++ branches/1.4/tonezone.c Mon Jan 14 12:30:53 2008
@@ -369,7 +369,8 @@
 
 	x = z->zone;
 	if ((res = ioctl(fd, ZT_FREEZONE, &x))) {
-		fprintf(stderr, "ioctl(ZT_FREEZONE) failed: %s\n", strerror(errno));
+		if (errno != EBUSY)
+			fprintf(stderr, "ioctl(ZT_FREEZONE) failed: %s\n", strerror(errno));
 		return res;
 	}
 

Modified: branches/1.4/ztcfg.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztcfg.c?view=diff&rev=3686&r1=3685&r2=3686
==============================================================================
--- branches/1.4/ztcfg.c (original)
+++ branches/1.4/ztcfg.c Mon Jan 14 12:30:53 2008
@@ -1451,7 +1451,8 @@
 						fflush(stdout);
 					}
 					if (tone_zone_register(fd, zonestoload[x]))
-						error("Unable to register tone zone '%s'\n", zonestoload[x]);
+						if (errno != EBUSY)
+							error("Unable to register tone zone '%s'\n", zonestoload[x]);
 				}
 				if (debug & DEBUG_APPLY) {
 					printf("Doing startup\n");