[asterisk-commits] mmichelson: branch 1.6.0 r112601 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr  3 09:42:58 2008
New Revision: 112601

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112601
Log:
Merged revisions 112600 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r112600 | mmichelson | 2008-04-03 09:35:47 -0500 (Thu, 03 Apr 2008) | 17 lines

Merged revisions 112599 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112599 | mmichelson | 2008-04-03 09:32:20 -0500 (Thu, 03 Apr 2008) | 9 lines

Fix the testing of the "res" variable so that it is more logically correct and 
makes the correct warning and debug messages print.

(closes issue #12361)
Reported by: one47
Patches:
      chan_zap_deferred_digit.patch uploaded by one47 (license 23)


........

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

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

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

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=112601&r1=112600&r2=112601
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Thu Apr  3 09:42:58 2008
@@ -4990,15 +4990,15 @@
 			case SIG_SF_FEATDMF:
 			case SIG_SF_FEATB:
 				/* FGD MF *Must* wait for wink */
-				if (!ast_strlen_zero(p->dop.dialstr))
+				if (!ast_strlen_zero(p->dop.dialstr)) {
 					res = ioctl(p->subs[SUB_REAL].zfd, ZT_DIAL, &p->dop);
-				else if (res < 0) {
-					ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel);
-					p->dop.dialstr[0] = '\0';
-					return NULL;
-				} else
-					ast_debug(1, "Sent deferred digit string: %s\n", p->dop.dialstr);
-
+					if (res < 0) {
+						ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel);
+						p->dop.dialstr[0] = '\0';
+						return NULL;
+					} else 
+						ast_debug(1, "Sent deferred digit string: %s\n", p->dop.dialstr);
+				}
 				p->dop.dialstr[0] = '\0';
 				break;
 			default:
@@ -5019,15 +5019,15 @@
 			case SIG_SF:
 			case SIG_SFWINK:
 			case SIG_SF_FEATD:
-				if (!ast_strlen_zero(p->dop.dialstr)) 
+				if (!ast_strlen_zero(p->dop.dialstr)) {
 					res = ioctl(p->subs[SUB_REAL].zfd, ZT_DIAL, &p->dop);
-				else if (res < 0) {
-					ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel);
-					p->dop.dialstr[0] = '\0';
-					return NULL;
-				} else
-					ast_debug(1, "Sent deferred digit string: %s\n", p->dop.dialstr);
-
+					if (res < 0) {
+						ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel);
+						p->dop.dialstr[0] = '\0';
+						return NULL;
+					} else 
+						ast_debug(1, "Sent deferred digit string: %s\n", p->dop.dialstr);
+				}
 				p->dop.dialstr[0] = '\0';
 				p->dop.op = ZT_DIAL_OP_REPLACE;
 				break;