aboutsummaryrefslogtreecommitdiffstats
path: root/funcs/func_timeout.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-06 21:32:42 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-06 21:32:42 +0000
commit891798ef49ba52fd250c018ae5eaa0c1e0b13993 (patch)
tree63ffa8d95553ed67237b9bf4f3a4c164678dd454 /funcs/func_timeout.c
parent8ea14a85923f9828ab421d7cbb3069a653e2eccb (diff)
Merged revisions 146802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r146802 | tilghman | 2008-10-06 16:09:05 -0500 (Mon, 06 Oct 2008) | 15 lines Merged revisions 146799 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r146799 | tilghman | 2008-10-06 15:52:04 -0500 (Mon, 06 Oct 2008) | 8 lines Dialplan functions should not actually return 0, unless they have modified the workspace. To signal an error (and no change to the workspace), -1 should be returned instead. (closes issue #13340) Reported by: kryptolus Patches: 20080827__bug13340__2.diff.txt uploaded by Corydon76 (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@146838 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_timeout.c')
-rw-r--r--funcs/func_timeout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 33db35e3d..625070217 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -74,7 +74,7 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data,
default:
ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
- break;
+ return -1;
}
return 0;