0033-rsync-Fix-some-incorrect-format-specifiers.patch (1623B)
1 From 0a32d4f555441c1928547f8f08a6373a6c9d8bf1 Mon Sep 17 00:00:00 2001 2 From: Michael Forney <mforney@mforney.org> 3 Date: Thu, 4 Jun 2020 21:36:24 -0700 4 Subject: [PATCH] rsync: Fix some incorrect format specifiers 5 6 --- 7 usr.bin/rsync/fargs.c | 4 ++-- 8 usr.bin/rsync/uploader.c | 2 +- 9 2 files changed, 3 insertions(+), 3 deletions(-) 10 11 diff --git a/usr.bin/rsync/fargs.c b/usr.bin/rsync/fargs.c 12 index 7ccb5bff7d2..ef1aaf37c87 100644 13 --- a/usr.bin/rsync/fargs.c 14 +++ b/usr.bin/rsync/fargs.c 15 @@ -132,9 +132,9 @@ fargs_cmdline(struct sess *sess, const struct fargs *f, size_t *skip) 16 /* --devices is sent as -D --no-specials */ 17 addargs(&args, "--no-specials"); 18 if (sess->opts->max_size >= 0) 19 - addargs(&args, "--max-size=%lld", sess->opts->max_size); 20 + addargs(&args, "--max-size=%jd", (intmax_t)sess->opts->max_size); 21 if (sess->opts->min_size >= 0) 22 - addargs(&args, "--min-size=%lld", sess->opts->min_size); 23 + addargs(&args, "--min-size=%jd", (intmax_t)sess->opts->min_size); 24 25 /* only add --compare-dest, etc if this is the sender */ 26 if (sess->opts->alt_base_mode != 0 && 27 diff --git a/usr.bin/rsync/uploader.c b/usr.bin/rsync/uploader.c 28 index 678b6c96218..951a5ee4133 100644 29 --- a/usr.bin/rsync/uploader.c 30 +++ b/usr.bin/rsync/uploader.c 31 @@ -1010,7 +1010,7 @@ rsync_uploader(struct upload *u, int *fileinfd, 32 init_blk(&blk.blks[i], &blk, offs, i, mbuf, sess); 33 offs += blk.len; 34 LOG3( 35 - "i=%ld, offs=%lld, msz=%ld, blk.len=%lu, blk.rem=%lu", 36 + "i=%zu, offs=%td, msz=%zd, blk.len=%zu, blk.rem=%zu", 37 i, offs, msz, blk.len, blk.rem); 38 i++; 39 } while (i < blk.blksz); 40 -- 41 2.35.1 42