diff options
| author |   chl <chl@openbsd.org> | 2011-10-27 14:32:57 +0000 |
|---|---|---|
| committer | chl <chl@openbsd.org> | 2011-10-27 14:32:57 +0000 |
| commit | c50073ca8d55f7ab10e784b113cec51ff1db9406 (patch) | |
| tree | 94e8cbee59008ca7d4d65710875fbef263fe3df8 /usr.sbin/smtpd/queue_fsqueue_ascii.c | |
| parent | Split AHCI port multiplier detection out into a separate function. (diff) | |
| download | wireguard-openbsd-c50073ca8d55f7ab10e784b113cec51ff1db9406.tar.xz wireguard-openbsd-c50073ca8d55f7ab10e784b113cec51ff1db9406.zip | |
Use PRI{x,d}64 in format strings instead of %llx, %lld or %qd to print {u_,}int64_t or time_t
While there, cast some time_t to int64_t
These will fix build warnings for portable smptd
ok gilles@ eric@
Diffstat (limited to 'usr.sbin/smtpd/queue_fsqueue_ascii.c')
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue_ascii.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue_ascii.c b/usr.sbin/smtpd/queue_fsqueue_ascii.c index 3e1b546ef96..b5d06926863 100644 --- a/usr.sbin/smtpd/queue_fsqueue_ascii.c +++ b/usr.sbin/smtpd/queue_fsqueue_ascii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_fsqueue_ascii.c,v 1.4 2011/10/23 15:36:53 eric Exp $ */ +/* $OpenBSD: queue_fsqueue_ascii.c,v 1.5 2011/10/27 14:32:57 chl Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -32,6 +32,7 @@ #include <event.h> #include <fcntl.h> #include <imsg.h> +#include <inttypes.h> #include <libgen.h> #include <pwd.h> #include <stdio.h> @@ -109,7 +110,7 @@ ascii_load_evpid(struct envelope *ep, char *buf) static int ascii_dump_evpid(struct envelope *ep, FILE *fp) { - fprintf(fp, "%s: %016llx\n", KW_EVPID, ep->id); + fprintf(fp, "%s: %016" PRIx64 "\n", KW_EVPID, ep->id); return 1; } @@ -495,8 +496,8 @@ static int ascii_dump_ctime(struct envelope *ep, FILE *fp) { if (ep->creation) - fprintf(fp, "%s: %qd\n", KW_CTIME, - (u_int64_t)ep->creation); + fprintf(fp, "%s: %" PRId64 "\n", KW_CTIME, + (int64_t) ep->creation); return 1; } @@ -516,8 +517,8 @@ static int ascii_dump_expire(struct envelope *ep, FILE *fp) { if (ep->expire) - fprintf(fp, "%s: %qd\n", KW_EXPIRE, - (u_int64_t)ep->expire); + fprintf(fp, "%s: %" PRId64 "\n", KW_EXPIRE, + (int64_t) ep->expire); return 1; } @@ -556,8 +557,8 @@ static int ascii_dump_lasttry(struct envelope *ep, FILE *fp) { if (ep->lasttry) - fprintf(fp, "%s: %qd\n", KW_LAST_TRY, - (u_int64_t)ep->lasttry); + fprintf(fp, "%s: %" PRId64 "\n", KW_LAST_TRY, + (int64_t) ep->lasttry); return 1; } |