matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devlink: Fix printf() type mismatches on 32-bit architectures 

devlink currently uses "%lu" to format values of type uint64_t,
but on 32-bit architectures uint64_t is defined as unsigned
long long and this does not work correctly.

Fix this by using the standard macro PRIu64 instead.

Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Ben Hutchings 2021-06-29 01:25:59 +02:00 committed by Stephen Hemminger
parent 4ac0383a59
commit 33cf9306c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devlink/devlink.c
View File

@ -3546,7 +3546,7 @@ static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
} }
} }
if (total) { if (total) {
pr_out_tty(" %3lu%%", (done * 100) / total); pr_out_tty(" %3"PRIu64"%%", (done * 100) / total);
ctx->last_pc = 1; ctx->last_pc = 1;
} else { } else {
ctx->last_pc = 0; ctx->last_pc = 0;
@ -3601,7 +3601,7 @@ static void cmd_dev_flash_time_elapsed(struct cmd_dev_flash_status_ctx *ctx)
*/ */
if (!ctx->status_msg_timeout) { if (!ctx->status_msg_timeout) {
len = snprintf(msg, sizeof(msg), len = snprintf(msg, sizeof(msg),
" ( %lum %lus )", elapsed_m, elapsed_s); " ( %"PRIu64"m %"PRIu64"s )", elapsed_m, elapsed_s);
} else if (res.tv_sec <= ctx->status_msg_timeout) { } else if (res.tv_sec <= ctx->status_msg_timeout) {
uint64_t timeout_m, timeout_s; uint64_t timeout_m, timeout_s;
@ -3609,11 +3609,11 @@ static void cmd_dev_flash_time_elapsed(struct cmd_dev_flash_status_ctx *ctx)
timeout_s = ctx->status_msg_timeout % 60; timeout_s = ctx->status_msg_timeout % 60;
len = snprintf(msg, sizeof(msg), len = snprintf(msg, sizeof(msg),
" ( %lum %lus : %lum %lus )", " ( %"PRIu64"m %"PRIu64"s : %"PRIu64"m %"PRIu64"s )",
elapsed_m, elapsed_s, timeout_m, timeout_s); elapsed_m, elapsed_s, timeout_m, timeout_s);
} else { } else {
len = snprintf(msg, sizeof(msg), len = snprintf(msg, sizeof(msg),
" ( %lum %lus : timeout reached )", elapsed_m, elapsed_s); " ( %"PRIu64"m %"PRIu64"s : timeout reached )", elapsed_m, elapsed_s);
} }
ctx->elapsed_time_msg_len = len; ctx->elapsed_time_msg_len = len;