On Tue, Mar 07, 2017 at 09:15:25AM -0500, J William Piggott wrote:
>
>
> On 03/05/2017 03:52 PM, Sami Kerola wrote:
>
> 8< ---
>
> > + fputs(_( " -o <format> output format; can be one of:\n"
> > + " value, device, export or full; (default: full)\n"), out);
>
> This says there are four output formats, but the error message
> below lists six?
>
> 8< ---
>
> > @@ -721,39 +724,38 @@ int main(int argc, char **argv)
> > else if (!strcmp(optarg, "full"))
> > output_format = 0;
> > else {
> > - fprintf(stderr, "Invalid output format %s. "
> > + errx(BLKID_EXIT_OTHER, _("Invalid output format %s. "
> > "Choose from value,\n\t"
> > - "device, list, udev or full\n", optarg);
> > - exit(BLKID_EXIT_OTHER);
> > + "value, device, list, udev, export, or full"), optarg);
>
>
> 8< ---
>
>
> Looks like the above outputs 'value' twice?
>
> Maybe it should also have a colon "Choose from:\n\t"
>
> A single line would be preferable I think:
> "Choose from: value, device, list, udev, export, or full"
The message is unnecessary complex, the list of the supported
arguments is overkill. I have merged:
errx(BLKID_EXIT_OTHER, _("unsupported output format %s"), optarg);
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
