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_waituntil.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_waituntil.c')
| -rw-r--r-- | apps/app_waituntil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_waituntil.c b/apps/app_waituntil.c index 98345b141..8b903b0ba 100644 --- a/apps/app_waituntil.c +++ b/apps/app_waituntil.c @@ -50,7 +50,7 @@ static int waituntil_exec(struct ast_channel *chan, void *data) double fraction; long seconds; struct timeval future = { 0, }; - struct timeval tv = ast_tvnow(); + struct timeval now = ast_tvnow(); int msec; if (ast_strlen_zero(data)) { @@ -68,8 +68,8 @@ static int waituntil_exec(struct ast_channel *chan, void *data) future.tv_sec = seconds; future.tv_usec = fraction * 1000000; - if ((msec = ast_tvdiff_ms(future, tv)) < 0) { - ast_log(LOG_NOTICE, "WaitUntil called in the past (now %ld, arg %ld)\n", (long)tv.tv_sec, (long)future.tv_sec); + if ((msec = ast_tvdiff_ms(future, now)) < 0) { + ast_log(LOG_NOTICE, "WaitUntil called in the past (now %ld, arg %ld)\n", (long)now.tv_sec, (long)future.tv_sec); pbx_builtin_setvar_helper(chan, "WAITUNTILSTATUS", "PAST"); return 0; } |