nbdkit/0004-xz-Fix-error-message-to-refer-to-xz-max-block-parame.patch
Richard W.M. Jones 3fc58c8fb6 Add all upstream patches
These are needed to get OCaml 5 to work.
2023-07-12 15:22:55 +01:00

41 lines
1.6 KiB
Diff

From 35db543e38293808e910b291ff26b17284640ec9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 19 Jun 2023 13:53:09 +0100
Subject: [PATCH 04/15] xz: Fix error message to refer to xz-max-block
parameter
In the original xz plugin the parameter was called "maxblock", but
when we converted the plugin to a filter (commit c879d31047 "Rewrite
xz plugin as a filter.") we changed the parameter name to
"xz-max-block" but retained the old name in the error message.
Fixes: commit c879d31047ae149cedabd5abbdb0a95e610f01c5
---
filters/xz/xz.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/filters/xz/xz.c b/filters/xz/xz.c
index 0c92cfff4..21e8993b5 100644
--- a/filters/xz/xz.c
+++ b/filters/xz/xz.c
@@ -143,12 +143,12 @@ xz_prepare (nbdkit_next *next, void *handle,
return -1;
if (maxblock < xzfile_max_uncompressed_block_size (h->xz)) {
- nbdkit_error ("xz file largest block is bigger than maxblock\n"
+ nbdkit_error ("xz file largest block is bigger than xz-max-block\n"
"Either recompress the xz file with smaller blocks "
"(see nbdkit-xz-filter(1))\n"
- "or make maxblock parameter bigger.\n"
- "maxblock = %" PRIu64 " (bytes)\n"
- "largest block in xz file = %" PRIu64 " (bytes)",
+ "or make xz-max-block parameter bigger.\n"
+ "Current xz-max-block = %" PRIu64 " (bytes)\n"
+ "Largest block in xz file = %" PRIu64 " (bytes)",
maxblock,
xzfile_max_uncompressed_block_size (h->xz));
return -1;
--
2.41.0