[asterisk-commits] russell: trunk r80550 - in /trunk: ./ funcs/func_timeout.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 23 14:30:49 CDT 2007
Author: russell
Date: Thu Aug 23 14:30:49 2007
New Revision: 80550
URL: http://svn.digium.com/view/asterisk?view=rev&rev=80550
Log:
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
........
Modified:
trunk/ (props changed)
trunk/funcs/func_timeout.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/funcs/func_timeout.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_timeout.c?view=diff&rev=80550&r1=80549&r2=80550
==============================================================================
--- trunk/funcs/func_timeout.c (original)
+++ trunk/funcs/func_timeout.c Thu Aug 23 14:30:49 2007
@@ -90,7 +90,6 @@
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 @@
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':
More information about the asterisk-commits
mailing list