diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
| commit | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_dial.c | |
| parent | 1013afa1ad09d854207d24d3aed691321fecc100 (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index a03dfc0ab..772c14910 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2018,7 +2018,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) { char *parse; const char *context = NULL; - int sleep = 0, loops = 0, res = -1; + int sleepms = 0, loops = 0, res = -1; struct ast_flags64 peerflags = { 0, }; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(announce); @@ -2035,8 +2035,8 @@ static int retrydial_exec(struct ast_channel *chan, void *data) parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); - if ((sleep = atoi(args.sleep))) - sleep *= 1000; + if ((sleepms = atoi(args.sleep))) + sleepms *= 1000; loops = atoi(args.retries); @@ -2045,8 +2045,8 @@ static int retrydial_exec(struct ast_channel *chan, void *data) goto done; } - if (sleep < 1000) - sleep = 10000; + if (sleepms < 1000) + sleepms = 10000; if (!loops) loops = -1; /* run forever */ @@ -2077,10 +2077,10 @@ static int retrydial_exec(struct ast_channel *chan, void *data) } else ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce); } - if (!res && sleep) { + if (!res && sleepms) { if (!ast_test_flag(chan, AST_FLAG_MOH)) ast_moh_start(chan, NULL, NULL); - res = ast_waitfordigit(chan, sleep); + res = ast_waitfordigit(chan, sleepms); } } else { if (!ast_strlen_zero(args.announce)) { @@ -2090,11 +2090,11 @@ static int retrydial_exec(struct ast_channel *chan, void *data) } else ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce); } - if (sleep) { + if (sleepms) { if (!ast_test_flag(chan, AST_FLAG_MOH)) ast_moh_start(chan, NULL, NULL); if (!res) - res = ast_waitfordigit(chan, sleep); + res = ast_waitfordigit(chan, sleepms); } } } |