diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-01-21 00:23:13 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-01-21 00:23:13 +0000 |
| commit | 20c6ff71b634e8c200dedec3781776d89fbf22a6 (patch) | |
| tree | 026a5e27c578af054feb5363cdd6d589dbf52830 /funcs/func_timeout.c | |
| parent | 02408a2476a8462fda158829b3b75df5a33d9dad (diff) | |
Fix ast_app_dtget() time unit inconsistency.
Note: Noone calls ast_app_dtget() with the timeout parameter of zero so
the bad code normally will never get executed.
* Fix unnecessary floating point division in func_timeout.c
timeout_write() when all other values are integers.
(closes issue ASTERISK-16817)
Reported by: Dmitry Andrianov
........
Merged revisions 352029 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 352035 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_timeout.c')
| -rw-r--r-- | funcs/func_timeout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 53bbab753..d15e28f8d 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -171,7 +171,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, case 'r': case 'R': if (chan->pbx) { - chan->pbx->rtimeoutms = when.tv_sec * 1000 + when.tv_usec / 1000.0; + chan->pbx->rtimeoutms = when.tv_sec * 1000 + when.tv_usec / 1000; ast_verb(3, "Response timeout set to %.3f\n", chan->pbx->rtimeoutms / 1000.0); } break; @@ -179,7 +179,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, case 'd': case 'D': if (chan->pbx) { - chan->pbx->dtimeoutms = when.tv_sec * 1000 + when.tv_usec / 1000.0; + chan->pbx->dtimeoutms = when.tv_sec * 1000 + when.tv_usec / 1000; ast_verb(3, "Digit timeout set to %.3f\n", chan->pbx->dtimeoutms / 1000.0); } break; |