From 0ebb5c87775584b294cf0173ef900ff0e35435eb Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 23 Aug 2007 19:30:49 +0000 Subject: [PATCH] Merged revisions 80547 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80547 | russell | 2007-08-23 14:29:44 -0500 (Thu, 23 Aug 2007) | 3 lines Revert very broken fix for issue #10540 ... none of these values take ms so I don't know what I was thinking ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80550 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_timeout.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 3f510e4b06..58b78c167c 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -90,7 +90,6 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data, static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { - float f; int x; char timestr[64]; struct ast_tm myt; @@ -106,10 +105,9 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, if (!value) return -1; - f = atof(value); - if (f < 0) - f = 1.0; - x = (int) (f * 1000); + x = atoi(value); + if (x < 0) + x = 0; switch (*data) { case 'a':