From: Joshua Colp Date: Thu, 12 Jul 2007 19:19:03 +0000 (+0000) Subject: Merged revisions 74922 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2070 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f86a8bc2d93812d96d0ae77adb2779715720d9a;p=thirdparty%2Fasterisk.git Merged revisions 74922 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r74922 | file | 2007-07-12 16:17:59 -0300 (Thu, 12 Jul 2007) | 2 lines Whoops... didn't want this to be returned to 0 each iteration. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74923 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index b8dbc22825..105dc030e5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1992,6 +1992,7 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd) { + int begin_digit = 0; /* Stop if we're a zombie or need a soft hangup */ if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c)) @@ -1999,7 +2000,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd) /* Wait for a digit, no more than ms milliseconds total. */ while (ms) { struct ast_channel *rchan; - int outfd, begin_digit = 0; + int outfd; errno = 0; rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms);