summaryrefslogtreecommitdiff
path: root/main/abstract_jb.c
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2008-08-10 19:35:50 +0000
committerSean Bright <sean@malleable.com>2008-08-10 19:35:50 +0000
commitb69c8e6ab5b5d20a964d67e93cda8dc07da61fa4 (patch)
treeb4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/abstract_jb.c
parent3ffb39833b25a02108214d7584733bc6b9c334df (diff)
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/abstract_jb.c')
-rw-r--r--main/abstract_jb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 4d4704460..d5a4c7ffd 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -551,16 +551,16 @@ void ast_jb_destroy(struct ast_channel *chan)
}
-static long get_now(struct ast_jb *jb, struct timeval *tv)
+static long get_now(struct ast_jb *jb, struct timeval *when)
{
struct timeval now;
- if (!tv) {
- tv = &now;
- gettimeofday(tv, NULL);
+ if (!when) {
+ when = &now;
+ gettimeofday(when, NULL);
}
- return ast_tvdiff_ms(*tv, jb->timebase);
+ return ast_tvdiff_ms(*when, jb->timebase);
}