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

diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 3f510e4b0643d33e9db9c3d291a260ef253e47fb..58b78c167c2bccdb219f183bfbadff2d52952bb7 100644 (file)
--- 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':