cast time_t to long long for printf, reduces the diff with -portable
authorop <op@openbsd.org>
Wed, 10 May 2023 07:20:20 +0000 (07:20 +0000)
committerop <op@openbsd.org>
Wed, 10 May 2023 07:20:20 +0000 (07:20 +0000)
ok millert@

usr.sbin/smtpd/lka_filter.c

index 5292413..0ae45f0 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: lka_filter.c,v 1.68 2021/06/14 17:58:15 eric Exp $    */
+/*     $OpenBSD: lka_filter.c,v 1.69 2023/05/10 07:20:20 op Exp $      */
 
 /*
  * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org>
@@ -933,13 +933,13 @@ filter_protocol_query(struct filter *filter, uint64_t token, uint64_t reqid, con
                n = io_printf(lka_proc_get_io(filter->proc),
                    "filter|%s|%lld.%06ld|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s|%s\n",
                    PROTOCOL_VERSION,
-                   tv.tv_sec, tv.tv_usec,
+                   (long long int)tv.tv_sec, tv.tv_usec,
                    phase, reqid, token, fs->rdns, param);
        else
                n = io_printf(lka_proc_get_io(filter->proc),
                    "filter|%s|%lld.%06ld|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s\n",
                    PROTOCOL_VERSION,
-                   tv.tv_sec, tv.tv_usec,
+                   (long long int)tv.tv_sec, tv.tv_usec,
                    phase, reqid, token, param);
        if (n == -1)
                fatalx("failed to write to processor");
@@ -957,7 +957,7 @@ filter_data_query(struct filter *filter, uint64_t token, uint64_t reqid, const c
            "filter|%s|%lld.%06ld|smtp-in|data-line|"
            "%016"PRIx64"|%016"PRIx64"|%s\n",
            PROTOCOL_VERSION,
-           tv.tv_sec, tv.tv_usec,
+           (long long int)tv.tv_sec, tv.tv_usec,
            reqid, token, line);
        if (n == -1)
                fatalx("failed to write to processor");
@@ -1374,8 +1374,9 @@ report_smtp_broadcast(uint64_t reqid, const char *direction, struct timeval *tv,
                va_start(ap, format);
                if (io_printf(lka_proc_get_io(rp->name),
                    "report|%s|%lld.%06ld|%s|%s|%016"PRIx64"%s",
-                   PROTOCOL_VERSION, tv->tv_sec, tv->tv_usec, direction,
-                   event, reqid, format[0] != '\n' ? "|" : "") == -1 ||
+                   PROTOCOL_VERSION, (long long int)tv->tv_sec, tv->tv_usec,
+                   direction, event, reqid,
+                   format[0] != '\n' ? "|" : "") == -1 ||
                    io_vprintf(lka_proc_get_io(rp->name), format, ap) == -1)
                        fatalx("failed to write to processor");
                va_end(ap);