lib-smtp: fix uoff_t vs. size_t confusion

diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c
index 741096ffaa74a7d6886691f2131c977894d389c4..617d8ad9528c576921828ed0994f27f4c912a868 100644 (file)
--- a/src/lib-smtp/smtp-client-command.c
+++ b/src/lib-smtp/smtp-client-command.c
@@ -1200,7 +1200,7 @@ _cmd_bdat_send_chunks(struct _cmd_data_context *ctx,
        smtp_client_command_set_stream(cmd, chunk, FALSE);
        i_stream_unref(&chunk);
        smtp_client_command_printf(cmd,
-               "BDAT %"PRIuUOFF_T" LAST", data_size);
+               "BDAT %"PRIuSIZE_T" LAST", data_size);
        smtp_client_command_submit_after(cmd, cmd_prev);
 
        if (array_count(&ctx->cmds) == 0) {

diff --git a/src/lib-smtp/smtp-server-cmd-data.c b/src/lib-smtp/smtp-server-cmd-data.c
index 2d07dc2384c96a81ecbfa2276bdd656fe9c014cb..d728e445bd92288f58ec3229785f8592f5b410a5 100644 (file)
--- a/src/lib-smtp/smtp-server-cmd-data.c
+++ b/src/lib-smtp/smtp-server-cmd-data.c
@@ -146,7 +146,7 @@ cmd_data_chunk_finish(struct smtp_server_cmd_ctx *cmd)
                return;
 
        smtp_server_reply(cmd, 250, "2.0.0",
-               "Added %"PRIuSIZE_T" octets", data_cmd->chunk_size);
+               "Added %"PRIuUOFF_T" octets", data_cmd->chunk_size);
 }
 
 static void cmd_data_input_error(struct smtp_server_cmd_ctx *cmd)

diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index 1843fd39e49913c242b317ee5f06c133ad54b003..bea6977c9a9bdd2f4e59b852df9a7aa232bdfce5 100644 (file)
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -700,7 +700,7 @@ static void test_client_continue(void *dummy ATTR_UNUSED)
                }
 
                if (debug) {
-                       size_t raw_size = (size_t)-1, b64_size = (size_t)-1;
+                       uoff_t raw_size = (uoff_t)-1, b64_size = (uoff_t)-1;
 
                        (void)i_stream_get_size(fstream, TRUE, &raw_size);
                        (void)i_stream_get_size(payload, TRUE, &b64_size);