aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-14 17:51:06 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-14 17:51:06 +0000
commitee9be88946579e07e5182e2e33831287c5002e76 (patch)
tree233ab1891996f75939122bb0034eefd685a767e4 /server-client.c
parent0bb00a0df311a9d2b8c7b7ae17ef9f9112c61bb9 (diff)
downloadrtmux-ee9be88946579e07e5182e2e33831287c5002e76.tar.gz
rtmux-ee9be88946579e07e5182e2e33831287c5002e76.tar.bz2
rtmux-ee9be88946579e07e5182e2e33831287c5002e76.zip
Sync OpenBSD patchset 537:
Tidy up and fix some types, prompted by lint via deraadt.
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c
index cc3f8312..83b0f8ec 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.20 2009-11-13 16:51:49 tcunha Exp $ */
+/* $Id: server-client.c,v 1.21 2009-11-14 17:51:06 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -196,7 +196,9 @@ server_client_status_timer(void)
struct session *s;
struct job *job;
struct timeval tv;
- u_int i, interval;
+ u_int i;
+ int interval;
+ time_t difference;
if (gettimeofday(&tv, NULL) != 0)
fatal("gettimeofday failed");
@@ -219,9 +221,10 @@ server_client_status_timer(void)
continue;
interval = options_get_number(&s->options, "status-interval");
- if (tv.tv_sec - c->status_timer.tv_sec >= interval) {
+ difference = tv.tv_sec - c->status_timer.tv_sec;
+ if (difference >= interval) {
RB_FOREACH(job, jobs, &c->status_jobs)
- job_run(job);
+ job_run(job);
c->flags |= CLIENT_STATUS;
}
}