Субота, 24 січня 2015 р. 19:23:35 EEST, Benno Schulenberg було написано
таке:
Hello Yuri,
On Sat, Jan 24, 2015, at 08:18, Yuri Chornoivan wrote:
--- a/Documentation/releases/v2.25-ReleaseNotes
+++ b/Documentation/releases/v2.25-ReleaseNotes
@@ -203,7 +203,7 @@ cal:
- mention where Gregorian reformation happen in September
1752 [Sami Kerola]
- remove optional from short arg -w [Tommi Kyntola]
- remove unnecessary static variables [Sami Kerola]
- - remove unnused structure and definition [Sami Kerola]
+ - remove unused structure and definition [Sami Kerola]
These lines were automatically generated from commit messages;
if you change them in the release notes, they cannot be used
anymore to find the corresponding commit.
All the other changes are good, except for this one:
- fdisk_warnx(cxt, _("unssuported GPT attribute bit '%s'"), p);
+ fdisk_warnx(cxt, _("unsuported GPT attribute bit '%s'"), p);
You missed the single that should be a double p.
But I think you caught all the other typos. :)
Some of them I already corrected in this patch:
http://www.spinics.net/lists/util-linux-ng/msg10888.html
If you exclude those from your patch, it will then apply after
mine without conflict.
Benno
Many thanks for suggestions. A fixed version of the patch is attached.
Best regards,
Yuri
From ae4190566336db1ab50e15e2cc20414a6075adf0 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@xxxxxxx>
Date: Sun, 25 Jan 2015 09:59:10 +0200
Subject: [PATCH] Fix various minor typos
To: util-linux@xxxxxxxxxxxxxxx
---
disk-utils/fdisk-list.c | 6 +++---
disk-utils/sfdisk.c | 24 ++++++++++++------------
libfdisk/src/gpt.c | 2 +-
misc-utils/whereis.c | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
index 824eb48..c65b8b4 100644
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
@@ -104,13 +104,13 @@ void list_disklabel(struct fdisk_context *cxt)
itr = fdisk_new_iter(FDISK_ITER_FORWARD);
if (!itr) {
- fdisk_warn(cxt, _("faild to allocate iterator"));
+ fdisk_warn(cxt, _("failed to allocate iterator"));
goto done;
}
out = scols_new_table();
if (!out) {
- fdisk_warn(cxt, _("faild to allocate output table"));
+ fdisk_warn(cxt, _("failed to allocate output table"));
goto done;
}
@@ -151,7 +151,7 @@ void list_disklabel(struct fdisk_context *cxt)
struct libscols_line *ln = scols_table_new_line(out, NULL);
if (!ln) {
- fdisk_warn(cxt, _("faild to allocate output line"));
+ fdisk_warn(cxt, _("failed to allocate output line"));
goto done;
}
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 4142181..599e010 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -659,7 +659,7 @@ static void assign_device_partition(struct sfdisk *sf,
errx(EXIT_FAILURE, _("%s: partition %zu: partition table contains %zu "
"partitions only."), devname, partno, n);
if (!fdisk_is_partition_used(sf->cxt, partno - 1))
- errx(EXIT_FAILURE, _("%s: partition %zu: partition unnused"),
+ errx(EXIT_FAILURE, _("%s: partition %zu: partition unused"),
devname, partno);
}
@@ -684,7 +684,7 @@ static int command_parttype(struct sfdisk *sf, int argc, char **argv)
if (argc == 3)
typestr = argv[2];
else if (argc > 3)
- errx(EXIT_FAILURE, _("uneexpected arguments"));
+ errx(EXIT_FAILURE, _("unexpected arguments"));
/* read-only when a new <type> undefined */
assign_device_partition(sf, devname, partno, !typestr);
@@ -748,7 +748,7 @@ static int command_partuuid(struct sfdisk *sf, int argc, char **argv)
if (argc == 3)
uuid = argv[2];
else if (argc > 3)
- errx(EXIT_FAILURE, _("uneexpected arguments"));
+ errx(EXIT_FAILURE, _("unexpected arguments"));
/* read-only if uuid not given */
assign_device_partition(sf, devname, partno, !uuid);
@@ -803,7 +803,7 @@ static int command_partlabel(struct sfdisk *sf, int argc, char **argv)
if (argc == 3)
name = argv[2];
else if (argc > 3)
- errx(EXIT_FAILURE, _("uneexpected arguments"));
+ errx(EXIT_FAILURE, _("unexpected arguments"));
/* read-only if name not given */
assign_device_partition(sf, devname, partno, !name);
@@ -859,7 +859,7 @@ static int command_partattrs(struct sfdisk *sf, int argc, char **argv)
if (argc == 3)
attrs = argv[2];
else if (argc > 3)
- errx(EXIT_FAILURE, _("uneexpected arguments"));
+ errx(EXIT_FAILURE, _("unexpected arguments"));
/* read-only if name not given */
assign_device_partition(sf, devname, partno, !attrs);
@@ -932,7 +932,7 @@ static void command_fdisk_help(void)
fputs(_(" Commands:\n"), stdout);
color_disable();
fputs(_(" write write table to disk and exit\n"), stdout);
- fputs(_(" quit show new situation and wait for user's feedbadk before write\n"), stdout);
+ fputs(_(" quit show new situation and wait for user's feedback before write\n"), stdout);
fputs(_(" abort exit sfdisk shell\n"), stdout);
fputs(_(" print print partition table.\n"), stdout);
fputs(_(" help this help.\n"), stdout);
@@ -943,7 +943,7 @@ static void command_fdisk_help(void)
color_scheme_enable("help-title", UL_COLOR_BOLD);
fputs(_(" Input format:\n"), stdout);
color_disable();
- fputs(_(" <start>, <size>, <typy>, <bootable>\n"), stdout);
+ fputs(_(" <start>, <size>, <type>, <bootable>\n"), stdout);
fputc('\n', stdout);
fputs(_(" <start> begin of the partition in sectors or bytes if specified\n"
@@ -1340,7 +1340,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -b, --backup backup partition table sectors (see -O)\n"), out);
fputs(_(" -f, --force disable all consistency checking\n"), out);
fputs(_(" -o, --output <list> output columns\n"), out);
- fputs(_(" -O, --backup-file <path> override default backout file name\n"), out);
+ fputs(_(" -O, --backup-file <path> override default backup file name\n"), out);
fputs(_(" -N, --partno <num> specify partition number\n"), out);
fputs(_(" -X, --label <name> specify label type (dos, gpt, ...)\n"), out);
fputs(_(" -Y, --label-nested <name> specify nested label type (dos, bsd)\n"), out);
@@ -1349,7 +1349,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" --no-reread do not check whether the device is in use\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(_(" -u, --unit S deprecated, only sector unit is supported\n"), out);
- fputs(_(" -L, --Linux deprecated, only for backward copatibility\n"), out);
+ fputs(_(" -L, --Linux deprecated, only for backward compatibility\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(USAGE_HELP, out);
@@ -1441,11 +1441,11 @@ int main(int argc, char *argv[])
case OPT_CHANGE_ID:
case OPT_PRINT_ID:
case OPT_ID:
- warnx(_("%s is deprecated in favour of ---part-type"),
+ warnx(_("%s is deprecated in favour of --part-type"),
longopts[longidx].name);
sf->act = ACT_PARTTYPE;
case 'c':
- warnx(_("--id s deprecated in favour of ---part-type"));
+ warnx(_("--id is deprecated in favour of --part-type"));
sf->act = ACT_PARTTYPE;
break;
case 'd':
@@ -1490,7 +1490,7 @@ int main(int argc, char *argv[])
break;
case 'u':
if (*optarg != 'S')
- errx(EXIT_FAILURE, _("unssupported unit '%c'"), *optarg);
+ errx(EXIT_FAILURE, _("unsupported unit '%c'"), *optarg);
break;
case 'v':
printf(_("%s from %s\n"), program_invocation_short_name,
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index f6e1741..2f1fe2e 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -1447,7 +1447,7 @@ static int gpt_entry_attrs_from_string(
}
if (bit < 0) {
- fdisk_warnx(cxt, _("unssuported GPT attribute bit '%s'"), p);
+ fdisk_warnx(cxt, _("unsupported GPT attribute bit '%s'"), p);
return -EINVAL;
}
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index da809a1..e6f5b41 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -600,7 +600,7 @@ int main(int argc, char **argv)
usage(stderr);
}
- if (arg_i < i) /* moved the the next argv[] item */
+ if (arg_i < i) /* moved to the next argv[] item */
break;
}
}
--
1.8.5.6
