cast to '(long long)' instead of '(long long int)'

while here adjust the spacing in some of the touched lines.
requested by deraadt@, ok tb@

diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c
index 84fd035..61e7b03 100644 (file)
--- a/usr.sbin/smtpd/bounce.c
+++ b/usr.sbin/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bounce.c,v 1.88 2023/05/04 12:43:44 chrisz Exp $      */
+/*     $OpenBSD: bounce.c,v 1.89 2023/05/15 12:03:04 op Exp $  */
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
@@ -305,7 +305,7 @@ bounce_send(struct bounce_session *s, const char *fmt, ...)
 }
 
 static const char *
-bounce_duration(long long int d)
+bounce_duration(long long d)
 {
        static char buf[32];
 

diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c
index 0ae45f0..0c63657 100644 (file)
--- a/usr.sbin/smtpd/lka_filter.c
+++ b/usr.sbin/smtpd/lka_filter.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: lka_filter.c,v 1.69 2023/05/10 07:20:20 op Exp $      */
+/*     $OpenBSD: lka_filter.c,v 1.70 2023/05/15 12:03:04 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,
-                   (long long int)tv.tv_sec, tv.tv_usec,
+                   (long long)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,
-                   (long long int)tv.tv_sec, tv.tv_usec,
+                   (long long)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,
-           (long long int)tv.tv_sec, tv.tv_usec,
+           (long long)tv.tv_sec, tv.tv_usec,
            reqid, token, line);
        if (n == -1)
                fatalx("failed to write to processor");
@@ -1374,7 +1374,7 @@ 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, (long long int)tv->tv_sec, tv->tv_usec,
+                   PROTOCOL_VERSION, (long long)tv->tv_sec, tv->tv_usec,
                    direction, event, reqid,
                    format[0] != '\n' ? "|" : "") == -1 ||
                    io_vprintf(lka_proc_get_io(rp->name), format, ap) == -1)

diff --git a/usr.sbin/smtpd/mail.maildir.c b/usr.sbin/smtpd/mail.maildir.c
index 355831e..fb221da 100644 (file)
--- a/usr.sbin/smtpd/mail.maildir.c
+++ b/usr.sbin/smtpd/mail.maildir.c
@@ -171,7 +171,7 @@ maildir_engine(const char *dirname, int junk)
                (void)strlcpy(hostname, "localhost", sizeof hostname);
 
        (void)snprintf(filename, sizeof filename, "%lld.%08x.%s",
-           (long long int) time(NULL),
+           (long long)time(NULL),
            arc4random(),
            hostname);
 

diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c
index 0d40a63..92f1ec7 100644 (file)
--- a/usr.sbin/smtpd/mta_session.c
+++ b/usr.sbin/smtpd/mta_session.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mta_session.c,v 1.147 2022/09/26 08:48:52 martijn Exp $       */
+/*     $OpenBSD: mta_session.c,v 1.148 2023/05/15 12:03:04 op Exp $    */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -1157,7 +1157,7 @@ mta_response(struct mta_session *s, char *line)
                        s->rcptcount = 0;
                        if (s->relay->limits->sessdelay_transaction) {
                                log_debug("debug: mta: waiting for %llds before next transaction",
-                                   (long long int)s->relay->limits->sessdelay_transaction);
+                                   (long long)s->relay->limits->sessdelay_transaction);
                                s->hangon = s->relay->limits->sessdelay_transaction -1;
                                s->flags |= MTA_HANGON;
                                runq_schedule(hangon,
@@ -1177,7 +1177,7 @@ mta_response(struct mta_session *s, char *line)
                }
                if (s->relay->limits->sessdelay_transaction) {
                        log_debug("debug: mta: waiting for %llds after reset",
-                           (long long int)s->relay->limits->sessdelay_transaction);
+                           (long long)s->relay->limits->sessdelay_transaction);
                        s->hangon = s->relay->limits->sessdelay_transaction -1;
                        s->flags |= MTA_HANGON;
                        runq_schedule(hangon,

diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index cc98b93..8466302 100644 (file)
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: smtpctl.c,v 1.170 2022/02/25 17:31:40 rob Exp $       */
+/*     $OpenBSD: smtpctl.c,v 1.171 2023/05/15 12:03:04 op Exp $        */
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -136,7 +136,7 @@ offline_file(void)
        FILE   *fp;
 
        if (!bsnprintf(path, sizeof(path), "%s%s/%lld.XXXXXXXXXX", PATH_SPOOL,
-               PATH_OFFLINE, (long long int) time(NULL)))
+           PATH_OFFLINE, (long long)time(NULL)))
                err(EX_UNAVAILABLE, "snprintf");
 
        if ((fd = mkstemp(path)) == -1 || (fp = fdopen(fd, "w+")) == NULL) {