Skip to content

Commit

Permalink
lib-smtp: fix uoff_t vs. size_t confusion
Browse files Browse the repository at this point in the history
  • Loading branch information
Josef 'Jeff' Sipek committed Dec 12, 2017
1 parent e7e3f40 commit 836ed7e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/lib-smtp/smtp-client-command.c
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib-smtp/smtp-server-cmd-data.c
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/lib-smtp/test-smtp-payload.c
Expand Up @@ -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);
Expand Down

0 comments on commit 836ed7e

Please sign in to comment.