0032-rsync-Fix-some-incorrect-format-specifiers.patch (1614B)
- From e2bc701601abc23299d9a694cb3173bdb44fff83 Mon Sep 17 00:00:00 2001
- From: Michael Forney <mforney@mforney.org>
- Date: Thu, 4 Jun 2020 21:36:24 -0700
- Subject: [PATCH] rsync: Fix some incorrect format specifiers
- ---
- usr.bin/rsync/fargs.c | 4 ++--
- usr.bin/rsync/uploader.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
- diff --git a/usr.bin/rsync/fargs.c b/usr.bin/rsync/fargs.c
- index cbc8537f38c..0b1c255550d 100644
- --- a/usr.bin/rsync/fargs.c
- +++ b/usr.bin/rsync/fargs.c
- @@ -134,9 +134,9 @@ fargs_cmdline(struct sess *sess, const struct fargs *f, size_t *skip)
- /* --devices is sent as -D --no-specials */
- addargs(&args, "--no-specials");
- if (sess->opts->max_size >= 0)
- - addargs(&args, "--max-size=%lld", sess->opts->max_size);
- + addargs(&args, "--max-size=%jd", (intmax_t)sess->opts->max_size);
- if (sess->opts->min_size >= 0)
- - addargs(&args, "--min-size=%lld", sess->opts->min_size);
- + addargs(&args, "--min-size=%jd", (intmax_t)sess->opts->min_size);
- /* extra options for the receiver (local is sender) */
- if (f->mode == FARGS_SENDER) {
- diff --git a/usr.bin/rsync/uploader.c b/usr.bin/rsync/uploader.c
- index 6cb6d054da7..09fedfaadbc 100644
- --- a/usr.bin/rsync/uploader.c
- +++ b/usr.bin/rsync/uploader.c
- @@ -1020,7 +1020,7 @@ rsync_uploader(struct upload *u, int *fileinfd,
- init_blk(&blk.blks[i], &blk, offs, i, mbuf, sess);
- offs += blk.len;
- LOG3(
- - "i=%ld, offs=%lld, msz=%ld, blk.len=%lu, blk.rem=%lu",
- + "i=%zu, offs=%td, msz=%zd, blk.len=%zu, blk.rem=%zu",
- i, offs, msz, blk.len, blk.rem);
- i++;
- } while (i < blk.blksz);
- --
- 2.49.0