global: Use uint32_t for pop3 order

diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 1bb7d30f7f17317d3d078de6e19f52f34bd7ea34..9396f451333cd417b78ed4bf31a9587533a7d7e7 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -1948,7 +1948,7 @@ dsync_ibc_stream_recv_mail(struct dsync_ibc *_ibc, struct dsync_mail **mail_r)
        if (dsync_deserializer_decode_try(decoder, "pop3_uidl", &value))
                mail->pop3_uidl = p_strdup(pool, value);
        if (dsync_deserializer_decode_try(decoder, "pop3_order", &value) &&
-           str_to_uint(value, &mail->pop3_order) < 0) {
+           str_to_uint32(value, &mail->pop3_order) < 0) {
                dsync_ibc_input_error(ibc, decoder, "Invalid pop3_order");
                return DSYNC_IBC_RECV_RET_TRYAGAIN;
        }

diff --git a/src/doveadm/dsync/dsync-mail.c b/src/doveadm/dsync/dsync-mail.c
index 72626ce4e3941be677370e90209cc2dc6f001511..2a009a95774cada0bb1824495f39ded4c3f615f0 100644 (file)
--- a/src/doveadm/dsync/dsync-mail.c
+++ b/src/doveadm/dsync/dsync-mail.c
@@ -101,7 +101,7 @@ int dsync_mail_fill_nonminimal(struct mail *mail, struct dsync_mail *dmail_r,
                return -1;
        }
        if (*str != '\0') {
-               if (str_to_uint(str, &dmail_r->pop3_order) < 0)
+               if (str_to_uint32(str, &dmail_r->pop3_order) < 0)
                        i_unreached();
        }
        if (mail_get_received_date(mail, &dmail_r->received_date) < 0) {

diff --git a/src/doveadm/dsync/dsync-mail.h b/src/doveadm/dsync/dsync-mail.h
index a18a7db7b711acda12fe88442c5a2dc5c3523d09..9d577f2961fcb9de2e5b1b8d65a73ff35fd0062d 100644 (file)
--- a/src/doveadm/dsync/dsync-mail.h
+++ b/src/doveadm/dsync/dsync-mail.h
@@ -24,7 +24,7 @@ struct dsync_mail {
        bool minimal_fields;
 
        const char *pop3_uidl;
-       unsigned int pop3_order;
+       uint32_t pop3_order;
        time_t received_date;
        /* Input stream containing the message text, or NULL if all instances
           of the message were already expunged from this mailbox. */

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index c089659a655270570f0be32ee5ed36827f576062..17a4b97b45fee4f45237f0799160c9301a3853be 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -667,7 +667,7 @@ struct mail_save_data {
 
        uint32_t uid, stub_seq;
        char *guid, *pop3_uidl, *from_envelope;
-       unsigned int pop3_order;
+       uint32_t pop3_order;
 
        struct ostream *output;
        struct mail_save_attachment *attach;