diff options
| author |   Eric Faurot <eric@faurot.net> | 2014-05-20 20:38:49 +0200 |
|---|---|---|
| committer | Eric Faurot <eric@faurot.net> | 2014-05-20 20:38:49 +0200 |
| commit | 5cf522319f5d9e02fbcfc11aed04532e9b93db8e (patch) | |
| tree | 22ac5bdff9a5d2649cfa1deecfb35c0be2fd74d6 | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | %i -> %d (diff) | |
| download | OpenSMTPD-5cf522319f5d9e02fbcfc11aed04532e9b93db8e.tar.xz OpenSMTPD-5cf522319f5d9e02fbcfc11aed04532e9b93db8e.zip | |
Merge branch 'master' into portableopensmtpd-201405202105p1
| -rw-r--r-- | smtpd/filter.c | 2 | ||||
| -rw-r--r-- | smtpd/mta.c | 4 | ||||
| -rw-r--r-- | smtpd/mta_session.c | 2 | ||||
| -rw-r--r-- | smtpd/scheduler.c | 2 | ||||
| -rw-r--r-- | smtpd/smtpctl.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/smtpd/filter.c b/smtpd/filter.c index 1d079555..5c1b3dc1 100644 --- a/smtpd/filter.c +++ b/smtpd/filter.c @@ -748,7 +748,7 @@ filter_tx_io(struct io *io, int evt) break; default: - log_warn("warn: filter_tx_io: bad evt (%i) for req %016"PRIx64, evt, s->id); + log_warn("warn: filter_tx_io: bad evt (%d) for req %016"PRIx64, evt, s->id); s->error = 1; break; } diff --git a/smtpd/mta.c b/smtpd/mta.c index 06d4a290..12f232c8 100644 --- a/smtpd/mta.c +++ b/smtpd/mta.c @@ -746,7 +746,7 @@ mta_delivery_flush_event(int fd, short event, void *arg) m_close(p_queue); } else { - log_warnx("warn: bad delivery type %i for %016" PRIx64, + log_warnx("warn: bad delivery type %d for %016" PRIx64, e->delivery, e->id); fatalx("aborting"); } @@ -777,7 +777,7 @@ mta_delivery_log(struct mta_envelope *e, const char *source, const char *relay, else if (delivery == IMSG_MTA_DELIVERY_LOOP) mta_log(e, "PermFail", source, relay, "Loop detected"); else { - log_warnx("warn: bad delivery type %i for %016" PRIx64, + log_warnx("warn: bad delivery type %d for %016" PRIx64, delivery, e->id); fatalx("aborting"); } diff --git a/smtpd/mta_session.c b/smtpd/mta_session.c index 7acb5a22..2b7b33f2 100644 --- a/smtpd/mta_session.c +++ b/smtpd/mta_session.c @@ -842,7 +842,7 @@ mta_enter_state(struct mta_session *s, int newstate) break; } - log_trace(TRACE_MTA, "mta: %p: >>> [...%zi bytes...]", s, q); + log_trace(TRACE_MTA, "mta: %p: >>> [...%zd bytes...]", s, q); break; case MTA_EOM: diff --git a/smtpd/scheduler.c b/smtpd/scheduler.c index af7253b7..4aeb41a0 100644 --- a/smtpd/scheduler.c +++ b/smtpd/scheduler.c @@ -232,7 +232,7 @@ scheduler_imsg(struct mproc *p, struct imsg *imsg) m_get_int(&m, &r); m_end(&m); log_trace(TRACE_SCHEDULER, - "scheduler: releasing %d on holdq (%i, %016" PRIx64 ")", + "scheduler: releasing %d on holdq (%d, %016" PRIx64 ")", r, type, holdq); backend->release(type, holdq, r); scheduler_reset_events(); diff --git a/smtpd/smtpctl.c b/smtpd/smtpctl.c index 819832b5..fd9d2387 100644 --- a/smtpd/smtpctl.c +++ b/smtpd/smtpctl.c @@ -971,10 +971,10 @@ show_queue_envelope(struct envelope *e, int online) if (online) { if (e->flags & EF_PENDING) - (void)snprintf(runstate, sizeof runstate, "pending|%zi", + (void)snprintf(runstate, sizeof runstate, "pending|%zd", (ssize_t)(e->nexttry - now)); else if (e->flags & EF_INFLIGHT) - (void)snprintf(runstate, sizeof runstate, "inflight|%zi", + (void)snprintf(runstate, sizeof runstate, "inflight|%zd", (ssize_t)(now - e->lasttry)); else (void)snprintf(runstate, sizeof runstate, "invalid|"); |