From: LiviaMedeiros <livia@cirno.name>
Date: Mon, 9 Dec 2024 09:16:30 +0000 (+0800)
Subject: zramctl: rename `--params` into `--algorithm-params`
X-Git-Tag: v2.42-start~122^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19c12e63b1c7a5bcf110bb9c41860101516bc38b;p=thirdparty%2Futil-linux.git

zramctl: rename `--params` into `--algorithm-params`
---

diff --git a/sys-utils/zramctl.8.adoc b/sys-utils/zramctl.8.adoc
index 6aa4b42d1..4cc402e5c 100644
--- a/sys-utils/zramctl.8.adoc
+++ b/sys-utils/zramctl.8.adoc
@@ -54,7 +54,7 @@ Define the status output columns to be used. If no output arrangement is specifi
 +
 The default list of columns may be extended if _list_ is specified in the format _+list_ (e.g., *zramctl -o+COMP-RATIO*).
 
-*-p*, *--params*::
+*-p*, *--algorithm-params*::
 Set the algorithm parameters, for example, *level=9 dict=/etc/dictionary* to set compression level and pre-trained dictionary. Parameters are algorithm specific.
 
 *--output-all*::
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 54ae64483..bdc3679cf 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -581,17 +581,17 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Set up and control zram devices.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --algorithm <alg>     compression algorithm to use\n"), out);
-	fputs(_(" -b, --bytes               print sizes in bytes rather than in human readable format\n"), out);
-	fputs(_(" -f, --find                find a free device\n"), out);
-	fputs(_(" -n, --noheadings          don't print headings\n"), out);
-	fputs(_(" -o, --output <list>       columns to use for status output\n"), out);
-	fputs(_("     --output-all          output all columns\n"), out);
-	fputs(_(" -p, --params <params>     algorithm parameters to use\n"), out);
-	fputs(_("     --raw                 use raw status output format\n"), out);
-	fputs(_(" -r, --reset               reset all specified devices\n"), out);
-	fputs(_(" -s, --size <size>         device size\n"), out);
-	fputs(_(" -t, --streams <number>    number of compression streams\n"), out);
+	fputs(_(" -a, --algorithm <alg>              compression algorithm to use\n"), out);
+	fputs(_(" -b, --bytes                        print sizes in bytes rather than in human readable format\n"), out);
+	fputs(_(" -f, --find                         find a free device\n"), out);
+	fputs(_(" -n, --noheadings                   don't print headings\n"), out);
+	fputs(_(" -o, --output <list>                columns to use for status output\n"), out);
+	fputs(_("     --output-all                   output all columns\n"), out);
+	fputs(_(" -p, --algorithm-params <params>    algorithm parameters to use\n"), out);
+	fputs(_("     --raw                          use raw status output format\n"), out);
+	fputs(_(" -r, --reset                        reset all specified devices\n"), out);
+	fputs(_(" -s, --size <size>                  device size\n"), out);
+	fputs(_(" -t, --streams <number>             number of compression streams\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
 	fprintf(out, USAGE_HELP_OPTIONS(27));
@@ -635,19 +635,19 @@ int main(int argc, char **argv)
 	};
 
 	static const struct option longopts[] = {
-		{ "algorithm", required_argument, NULL, 'a' },
-		{ "bytes",     no_argument, NULL, 'b' },
-		{ "find",      no_argument, NULL, 'f' },
-		{ "help",      no_argument, NULL, 'h' },
-		{ "output",    required_argument, NULL, 'o' },
-		{ "output-all",no_argument, NULL, OPT_LIST_TYPES },
-		{ "params",    required_argument, NULL, 'p' },
-		{ "noheadings",no_argument, NULL, 'n' },
-		{ "reset",     no_argument, NULL, 'r' },
-		{ "raw",       no_argument, NULL, OPT_RAW },
-		{ "size",      required_argument, NULL, 's' },
-		{ "streams",   required_argument, NULL, 't' },
-		{ "version",   no_argument, NULL, 'V' },
+		{ "algorithm",       required_argument, NULL, 'a' },
+		{ "bytes",           no_argument, NULL, 'b' },
+		{ "find",            no_argument, NULL, 'f' },
+		{ "help",            no_argument, NULL, 'h' },
+		{ "output",          required_argument, NULL, 'o' },
+		{ "output-all",      no_argument, NULL, OPT_LIST_TYPES },
+		{ "algorithm-params",required_argument, NULL, 'p' },
+		{ "noheadings",      no_argument, NULL, 'n' },
+		{ "reset",           no_argument, NULL, 'r' },
+		{ "raw",             no_argument, NULL, OPT_RAW },
+		{ "size",            required_argument, NULL, 's' },
+		{ "streams",         required_argument, NULL, 't' },
+		{ "version",         no_argument, NULL, 'V' },
 		{ NULL, 0, NULL, 0 }
 	};
 
@@ -723,7 +723,7 @@ int main(int argc, char **argv)
 		errx(EXIT_FAILURE, _("only one <device> at a time is allowed"));
 
 	if ((act == A_STATUS || act == A_FINDONLY) && (algorithm || algorithm_params || nstreams))
-		errx(EXIT_FAILURE, _("options --algorithm, --params, and --streams "
+		errx(EXIT_FAILURE, _("options --algorithm, --algorithm-params, and --streams "
 				     "must be combined with --size"));
 
 	ul_path_init_debug();