diff options
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/scheduler_ramqueue.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index bf4b33cd56d..6c9cf1175da 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.137 2012/03/19 20:38:49 gilles Exp $ */ +/* $OpenBSD: runner.c,v 1.138 2012/04/15 12:12:35 chl Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -493,10 +493,8 @@ runner_message_to_scheduler(u_int32_t msgid) { struct qwalk *q; u_int64_t evpid; - time_t curtm; struct envelope envelope; - curtm = time(NULL); q = qwalk_new(Q_QUEUE, msgid); while (qwalk(q, &evpid)) { if (! queue_envelope_load(Q_QUEUE, evpid, diff --git a/usr.sbin/smtpd/scheduler_ramqueue.c b/usr.sbin/smtpd/scheduler_ramqueue.c index c7643b48d2e..5ab1fd44719 100644 --- a/usr.sbin/smtpd/scheduler_ramqueue.c +++ b/usr.sbin/smtpd/scheduler_ramqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scheduler_ramqueue.c,v 1.6 2012/03/13 23:07:58 gilles Exp $ */ +/* $OpenBSD: scheduler_ramqueue.c,v 1.7 2012/04/15 12:12:35 chl Exp $ */ /* * Copyright (c) 2012 Gilles Chehade <gilles@openbsd.org> @@ -373,14 +373,12 @@ scheduler_ramqueue_schedule(u_int64_t evpid) struct ramqueue_envelope *rq_evp; struct ramqueue_message *rq_msg; struct ramqueue_batch *rq_batch; - struct ramqueue_host *rq_host; log_debug("scheduler_ramqueue: schedule"); rq_evp = ramqueue_lookup_envelope(evpid); rq_msg = rq_evp->rq_msg; rq_batch = rq_evp->rq_batch; - rq_host = rq_evp->rq_host; /* remove from msg tree, batch queue and linear queue */ RB_REMOVE(evptree, &rq_msg->evptree, rq_evp); diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index 5b61f8fc846..619820e54a7 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.78 2012/01/28 11:33:07 gilles Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.79 2012/04/15 12:12:35 chl Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -347,7 +347,6 @@ static int show_stats_output(struct imsg *imsg) { struct stats *stats; - struct stat_counter *s; if (imsg->hdr.type != IMSG_STATS) errx(1, "show_stats_output: bad hdr type (%d)", imsg->hdr.type); @@ -357,7 +356,6 @@ show_stats_output(struct imsg *imsg) stats = imsg->data; stat_init(stats->counters, STATS_MAX); - s = stats->counters; stat_print(STATS_CONTROL_SESSION, STAT_COUNT); stat_print(STATS_CONTROL_SESSION, STAT_ACTIVE); |