[Home]

Summary:ASTERISK-05159: [patch] PRIREDIRECTREASON typo in chan_zap.c
Reporter:knielsen (knielsen)Labels:
Date Opened:2005-09-27 08:17:42Date Closed:2008-01-15 15:49:28.000-0600
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Core/General
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) priredirect-patch1-dist.txt
Description:I stumpled upon this typo in chan_zap.c.

The PRIREDIRECTREASON PBX variable is spelled wrongly as PRIREDIRECTCAUSE in one branch of an if statement. Attached patch fixes this.

****** ADDITIONAL INFORMATION ******

This was clearly caused by an incomplete fix committed as chan_zap.c revision 1.473. The variable is set in two different places, but the name was only changed in one of them by this commit. CVS log details follow:

revision 1.473
date: 2005/07/13 15:13:12;  author: mattf;  state: Exp;  lines: +2 -2
Update variable name to match docs

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -u -r1.472 -r1.473
--- chan_zap.c 12 Jul 2005 02:33:57 -0000 1.472
+++ chan_zap.c 13 Jul 2005 15:13:12 -0000 1.473
@@ -41,7 +41,7 @@

#include "asterisk.h"

-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.472 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.473 $")

#include "asterisk/lock.h"
#include "asterisk/channel.h"
@@ -8237,7 +8237,7 @@
snprintf(calledtonstr, sizeof(calledtonstr)-1, "%d", e->ring.calledplan);
pbx_builtin_setvar_helper(c, "CALLEDTON", calledtonstr);
if (e->ring.redirectingreason >= 0)
- pbx_builtin_setvar_helper(c, "PRIREDIRECTCAUSE", redirectingreason2str(e->ring.redirectingreason));
+ pbx_builtin_setvar_helper(c, "PRIREDIRECTREASON", redirectingreason2str(e->ring.redirectingreason));

ast_mutex_lock(&pri->lock);
if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) {
Comments:By: Russell Bryant (russell) 2005-09-28 15:28:19

fixed in cvs head, thanks!

By: Digium Subversion (svnbot) 2008-01-15 15:49:28.000-0600

Repository: asterisk
Revision: 6676

U   trunk/channels/chan_zap.c

------------------------------------------------------------------------
r6676 | russell | 2008-01-15 15:49:28 -0600 (Tue, 15 Jan 2008) | 2 lines

fix variable name (issue ASTERISK-5159)

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=6676