aboutsummaryrefslogtreecommitdiffstats
path: root/main/taskprocessor.c
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-10 20:57:25 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-10 20:57:25 +0000
commit629f375c6772f9b889e7d31fe168b42ebb97310a (patch)
tree196064a73ee9fe49161ea581c2b372ccfe10926b /main/taskprocessor.c
parent9ae91f799ab15938b69b072b681fb606286d08ea (diff)
That's all, folks. Not going to update the Makefile until res_jabber is
converted (snuffy, you there? :)) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137110 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/taskprocessor.c')
-rw-r--r--main/taskprocessor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 140943f75..d98d97f1c 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -190,7 +190,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args
{
struct timeval begin, end, delta;
char *name;
- struct timeval tv;
+ struct timeval when;
struct timespec ts;
struct ast_taskprocessor *tps = NULL;
@@ -214,9 +214,9 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args
return CLI_SUCCESS;
}
ast_cli(a->fd, "\npinging %s ...", name);
- tv = ast_tvadd((begin = ast_tvnow()), ast_samp2tv(1000, 1000));
- ts.tv_sec = tv.tv_sec;
- ts.tv_nsec = tv.tv_usec * 1000;
+ when = ast_tvadd((begin = ast_tvnow()), ast_samp2tv(1000, 1000));
+ ts.tv_sec = when.tv_sec;
+ ts.tv_nsec = when.tv_usec * 1000;
ast_mutex_lock(&cli_ping_cond_lock);
if (ast_taskprocessor_push(tps, tps_ping_handler, 0) < 0) {
ast_cli(a->fd, "\nping failed: could not push task to %s\n\n", name);