global: Use PRIdTIME_T and PRIxTIME_T format specifiers

diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 99d0c1d38f94e494e3ae7b30690ff2077144e7f0..9e4a02f6dfdd0c82b22707a88005374c775eea71 100644 (file)
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -229,9 +229,9 @@ doveadm_cmd_director_list(struct doveadm_connection *conn,
 
                last_failed = I_MAX(host->last_network_failure,
                                    host->last_protocol_failure);
-               str_printfa(str, "%s\t%u\t%s\t%lu\t",
+               str_printfa(str, "%s\t%u\t%s\t%"PRIdTIME_T"\t",
                            net_ip2addr(&host->ip), host->port, type,
-                           (unsigned long)last_failed);
+                           last_failed);
                if (dir->self_host == host)
                        doveadm_director_append_status(dir, str);
                else

diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index a04beb404a6430d019937d939d3987bda2185970..ccd4b42fb0563e66ee77a5e3fbe3187cc4cfd673 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -1686,7 +1686,7 @@ dsync_ibc_stream_send_change(struct dsync_ibc *_ibc,
        }
        if (change->received_timestamp > 0) {
                dsync_serializer_encode_add(encoder, "received_timestamp",
-                       t_strdup_printf("%lx", (unsigned long)change->received_timestamp));
+                       t_strdup_printf("%"PRIxTIME_T, change->received_timestamp));
        }
        if (change->virtual_size > 0) {
                dsync_serializer_encode_add(encoder, "virtual_size",

diff --git a/src/lib-stats/stats-parser.c b/src/lib-stats/stats-parser.c
index bf36a870e29e1e4525b12357b389dea1f3a4294d..5e41446d16010623b15315cafdc9529ea72bb91b 100644 (file)
--- a/src/lib-stats/stats-parser.c
+++ b/src/lib-stats/stats-parser.c
@@ -170,8 +170,8 @@ void stats_parser_value(string_t *str,
        case STATS_PARSER_TYPE_TIMEVAL: {
                const struct timeval *tv = ptr;
 
-               str_printfa(str, "%lu.%u", (unsigned long)tv->tv_sec,
-                           (unsigned int)tv->tv_usec);
+               str_printfa(str, "%"PRIdTIME_T".%u",
+                           tv->tv_sec, (unsigned int)tv->tv_usec);
                break;
        }
        }

diff --git a/src/lib-storage/index/dbox-common/dbox-file.c b/src/lib-storage/index/dbox-common/dbox-file.c
index 205c780b1b1280e6357549840567e283d4801a51..fa14f484329b243703e00bf537ce1c79331984f5 100644 (file)
--- a/src/lib-storage/index/dbox-common/dbox-file.c
+++ b/src/lib-storage/index/dbox-common/dbox-file.c
@@ -34,8 +34,8 @@ const char *dbox_generate_tmp_filename(void)
 {
        static unsigned int create_count = 0;
 
-       return t_strdup_printf(DBOX_TEMP_FILE_PREFIX"%lu.P%sQ%uM%u.%s",
-                              (unsigned long)ioloop_timeval.tv_sec, my_pid,
+       return t_strdup_printf(DBOX_TEMP_FILE_PREFIX"%"PRIdTIME_T".P%sQ%uM%u.%s",
+                              ioloop_timeval.tv_sec, my_pid,
                               create_count++,
                               (unsigned int)ioloop_timeval.tv_usec,
                               my_hostname);

diff --git a/src/lib-storage/index/dbox-common/dbox-save.c b/src/lib-storage/index/dbox-common/dbox-save.c
index 633e2d48e6e781cb2a5e7c4bf4503f40603e240e..08c792723fb07eca3c4194fba0776c5a1a61a115 100644 (file)
--- a/src/lib-storage/index/dbox-common/dbox-save.c
+++ b/src/lib-storage/index/dbox-common/dbox-save.c
@@ -141,8 +141,8 @@ void dbox_save_write_metadata(struct mail_save_context *_ctx,
                str_printfa(str, "%c%llx\n", DBOX_METADATA_PHYSICAL_SIZE,
                            (unsigned long long)ctx->input->v_offset);
        }
-       str_printfa(str, "%c%lx\n", DBOX_METADATA_RECEIVED_TIME,
-                   (unsigned long)mdata->received_date);
+       str_printfa(str, "%c%"PRIxTIME_T"\n", DBOX_METADATA_RECEIVED_TIME,
+                   mdata->received_date);
        if (mail_get_virtual_size(_ctx->dest_mail, &vsize) < 0)
                i_unreached();
        str_printfa(str, "%c%llx\n", DBOX_METADATA_VIRTUAL_SIZE,

diff --git a/src/lib-storage/mail-search-mime.c b/src/lib-storage/mail-search-mime.c
index f8c73a86abcf7eb4da7e35bfec07c3d0d17793f8..83581fc4ce0c33a8fb9cad05bc0086a0e60f2a0c 100644 (file)
--- a/src/lib-storage/mail-search-mime.c
+++ b/src/lib-storage/mail-search-mime.c
@@ -507,7 +507,7 @@ bool mail_search_mime_arg_to_imap(string_t *dest,
                if (!mail_search_mime_arg_to_imap_date(dest, arg)) {
                        *error_r = t_strdup_printf(
                                "SENTBEFORE can't be written as IMAP MIMEPART key "
-                               "for timestamp %ld", (long)arg->value.time);
+                               "for timestamp %"PRIdTIME_T, arg->value.time);
                        return FALSE;
                }
                break;
@@ -516,7 +516,7 @@ bool mail_search_mime_arg_to_imap(string_t *dest,
                if (!mail_search_mime_arg_to_imap_date(dest, arg)) {
                        *error_r = t_strdup_printf(
                                "SENTON can't be written as IMAP MIMEPART key "
-                               "for timestamp %ld", (long)arg->value.time);
+                               "for timestamp %"PRIdTIME_T, arg->value.time);
                        return FALSE;
                }
                break;
@@ -525,7 +525,7 @@ bool mail_search_mime_arg_to_imap(string_t *dest,
                if (!mail_search_mime_arg_to_imap_date(dest, arg)) {
                        *error_r = t_strdup_printf(
                                "SENTSINCE can't be written as IMAP MIMEPART key "
-                               "for timestamp %ld", (long)arg->value.time);
+                               "for timestamp %"PRIdTIME_T, arg->value.time);
                        return FALSE;
                }
                break;

diff --git a/src/lib/iostream-rawlog.c b/src/lib/iostream-rawlog.c
index 7f082b1c395810093e87559be2bfbec613b7e976..e4e800c11a95a9e99158435e3f397573af3814b2 100644 (file)
--- a/src/lib/iostream-rawlog.c
+++ b/src/lib/iostream-rawlog.c
@@ -31,8 +31,8 @@ rawlog_write_timestamp(struct rawlog_iostream *rstream, bool line_ends)
                return;
 
        buffer_create_from_data(&buf, data, sizeof(data));
-       str_printfa(&buf, "%lu.%06u ",
-                   (unsigned long)ioloop_timeval.tv_sec,
+       str_printfa(&buf, "%"PRIdTIME_T".%06u ",
+                   ioloop_timeval.tv_sec,
                    (unsigned int)ioloop_timeval.tv_usec);
        if ((rstream->flags & IOSTREAM_RAWLOG_FLAG_BUFFERED) != 0) {
                str_append_c(&buf, rstream->input ? 'I' : 'O');

diff --git a/src/plugins/expire/doveadm-expire.c b/src/plugins/expire/doveadm-expire.c
index 0d65a0f67d20ae8a18ac2ad7189ab662f0c0b145..914f9c73029041dc555b03e031ceaeaba0ebdd68 100644 (file)
--- a/src/plugins/expire/doveadm-expire.c
+++ b/src/plugins/expire/doveadm-expire.c
@@ -139,8 +139,9 @@ doveadm_expire_mail_cmd_get_next_user(struct doveadm_mail_cmd_context *ctx,
                if ((time_t)oldest_savedate > ectx->oldest_before_time) {
                        if (doveadm_debug) {
                                i_debug("expire: Stopping iteration on key %s "
-                                       "(%lu > %ld)", key, oldest_savedate,
-                                       (long)ectx->oldest_before_time);
+                                       "(%lu > %"PRIdTIME_T")",
+                                       key, oldest_savedate,
+                                       ectx->oldest_before_time);
                        }
                        break;
                }