From f544c350ba24fc40d713dc26c5955462aff82000 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 22 Mar 2025 15:32:07 +0300 Subject: [PATCH] %l* -> %j* --- src/blockstore/blockstore_disk.cpp | 2 +- src/client/fio_cluster.cpp | 2 +- src/cmd/cli_rm_wildcard.cpp | 2 +- src/osd/osd_main.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blockstore/blockstore_disk.cpp b/src/blockstore/blockstore_disk.cpp index 35e7b3b6..86446a03 100644 --- a/src/blockstore/blockstore_disk.cpp +++ b/src/blockstore/blockstore_disk.cpp @@ -244,7 +244,7 @@ void blockstore_disk_t::calc_lengths(bool skip_meta_check) if (new_doesnt_fit) { printf("Warning: Using old metadata format without checksums because the new format" - " doesn't fit into provided area (%lu bytes required, %lu bytes available)\n", meta_len, meta_area_size); + " doesn't fit into provided area (%ju bytes required, %ju bytes available)\n", meta_len, meta_area_size); } clean_entry_size = clean_entry_v0_size; meta_len = meta_v0_len; diff --git a/src/client/fio_cluster.cpp b/src/client/fio_cluster.cpp index d94b101a..89f579f1 100644 --- a/src/client/fio_cluster.cpp +++ b/src/client/fio_cluster.cpp @@ -377,7 +377,7 @@ static void io_callback(void *opaque, long retval) bsd->completed.push_back(io); if (bsd->trace) { - printf("--- %s 0x%jx retval=%ld\n", io->ddir == DDIR_READ ? "READ" : + printf("--- %s 0x%jx retval=%jd\n", io->ddir == DDIR_READ ? "READ" : (io->ddir == DDIR_WRITE ? "WRITE" : "SYNC"), (uint64_t)io, retval); } } diff --git a/src/cmd/cli_rm_wildcard.cpp b/src/cmd/cli_rm_wildcard.cpp index 0dc35d98..872bae26 100644 --- a/src/cmd/cli_rm_wildcard.cpp +++ b/src/cmd/cli_rm_wildcard.cpp @@ -138,7 +138,7 @@ struct wildcard_remover_t if (inode_it != parent->cli->st_cli.inode_config.end()) fprintf(stderr, "Warning: image %s modified by someone else during deletion, restarting wildcard deletion\n", inode_it->second.name.c_str()); else - fprintf(stderr, "Warning: inode %lx modified by someone else during deletion, retrying wildcard deletion\n", irev.inode_num); + fprintf(stderr, "Warning: inode %jx modified by someone else during deletion, retrying wildcard deletion\n", irev.inode_num); goto resume_0; } } diff --git a/src/osd/osd_main.cpp b/src/osd/osd_main.cpp index 5082939c..79ea4a6d 100644 --- a/src/osd/osd_main.cpp +++ b/src/osd/osd_main.cpp @@ -58,7 +58,7 @@ int main(int narg, char *args[]) return 1; } char osdname[16] = { 0 }; - snprintf(osdname, 16, "osd%lu", config["osd_num"].uint64_value()); + snprintf(osdname, 16, "osd%ju", config["osd_num"].uint64_value()); prctl(PR_SET_NAME, (unsigned long)osdname, 0, 0, 0); signal(SIGINT, handle_sigint); signal(SIGTERM, handle_sigint);