From f7c0a2bf06603b2f66a0b3862b0c474c8120a591 Mon Sep 17 00:00:00 2001 From: ellie timoney Date: Mon, 29 Apr 2024 11:05:38 +1000 Subject: [PATCH] WIP misc: more 64-on-32 warnings --- imap/jmap_backup.c | 2 +- imap/mbtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imap/jmap_backup.c b/imap/jmap_backup.c index bff7a937f6f..9395453ed6d 100644 --- a/imap/jmap_backup.c +++ b/imap/jmap_backup.c @@ -385,7 +385,7 @@ static int restore_collection_cb(const mbentry_t *mbentry, void *rock) if ((rrock->jrestore->mode & UNDO_ALL) && rrock->jrestore->cutoff < rrock->mailbox->i.changes_epoch) { syslog(log_level, - "skipping '%s': cutoff (%ld) prior to mailbox history (" TIME_T_FMT")", + "skipping '%s': cutoff (" TIME_T_FMT ") prior to mailbox history (" TIME_T_FMT")", mailbox_name(rrock->mailbox), rrock->jrestore->cutoff, rrock->mailbox->i.changes_epoch); diff --git a/imap/mbtool.c b/imap/mbtool.c index 5755ca6771e..64c1aee906a 100644 --- a/imap/mbtool.c +++ b/imap/mbtool.c @@ -205,7 +205,7 @@ static int do_timestamp(const mbname_t *mbname) while ((msg = mailbox_iter_step(iter))) { const struct index_record *record = msg_record(msg); /* 1 day is close enough */ - if (labs(record->internaldate - record->gmtime) < 86400) + if (llabs(record->internaldate - record->gmtime) < 86400) continue; struct index_record copyrecord = *record;