kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 80547 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-08-23 19:30:49 +00:00
parent 558d533388
commit 0ebb5c8777
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
funcs/func_timeout.c
View File

@@ -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, static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
const char *value) const char *value)
{ {
float f;
int x; int x;
char timestr[64]; char timestr[64];
struct ast_tm myt; struct ast_tm myt;
@@ -106,10 +105,9 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
if (!value) if (!value)
return -1; return -1;
f = atof(value); x = atoi(value);
if (f < 0) if (x < 0)
f = 1.0; x = 0;
x = (int) (f * 1000);
switch (*data) { switch (*data) {
case 'a': case 'a':