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)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112601 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

@@ -4990,15 +4990,15 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
 			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 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
 			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;