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

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Jan  9 09:45:34 2008
New Revision: 97449

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

........
r97448 | kpfleming | 2008-01-09 09:43:19 -0600 (Wed, 09 Jan 2008) | 2 lines

pass the right variable to get an error string... oops

........

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=97449&r1=97448&r2=97449
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Jan  9 09:45:34 2008
@@ -1647,7 +1647,7 @@
 			x = 1;
 			res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &x);
 			if (res)
-				ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(res));
+				ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
 		}
 #if defined(HAVE_ZAPTEL_ECHOCANPARAMS)
 		res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOCANCEL_PARAMS, &p->echocancel);
@@ -1656,7 +1656,7 @@
 		res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOCANCEL, &x);
 #endif
 		if (res)  {
-			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(res));
+			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
 		} else {
 			p->echocanon = 1;
 			ast_debug(1, "Enabled echo cancellation on channel %d\n", p->channel);