From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 01/14] setarch: clean up usage()
Date: Mon, 8 Apr 2013 20:32:46 +0100 [thread overview]
Message-ID: <1365449579-13238-2-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1365449579-13238-1-git-send-email-kerolasa@iki.fi>
Requested-by: Karel Zak <kzak@redhat.com>
References: http://marc.info/?l=util-linux-ng&m=136516351523680&w=2
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/setarch.c | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index f6c0e20..051cbef 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -90,32 +90,30 @@ enum {
static void __attribute__((__noreturn__))
show_help(void)
{
- printf(USAGE_HEADER);
- printf(_(" %s%s [options] [program [program arguments]]\n"),
- program_invocation_short_name,
+ fputs(USAGE_HEADER, stdout);
+ printf(_(" %s%s [options] [program [program arguments]]\n"),
+ program_invocation_short_name,
!strcmp(program_invocation_short_name, "setarch") ? " <arch>" : "");
- printf(USAGE_OPTIONS);
- printf(_(
- " -v, --verbose says what options are being switched on\n"
- " -R, --addr-no-randomize disables randomization of the virtual address space\n"
- " -F, --fdpic-funcptrs makes function pointers point to descriptors\n"
- " -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n"
- " -L, --addr-compat-layout changes the way virtual memory is allocated\n"
- " -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n"
- " -B, --32bit turns on ADDR_LIMIT_32BIT\n"
- " -I, --short-inode turns on SHORT_INODE\n"
- " -S, --whole-seconds turns on WHOLE_SECONDS\n"
- " -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n"
- " -3, --3gb limits the used address space to a maximum of 3 GB\n"
- " --4gb ignored (for backward compatibility only)\n"
- " --uname-2.6 turns on UNAME26\n"));
- printf(_(
- " --list list settable architectures, and exit\n"));
+ fputs(USAGE_OPTIONS, stdout);
+ fputs(_(" -v, --verbose says what options are being switched on\n"), stdout);
+ fputs(_(" -R, --addr-no-randomize disables randomization of the virtual address space\n"), stdout);
+ fputs(_(" -F, --fdpic-funcptrs makes function pointers point to descriptors\n"), stdout);
+ fputs(_(" -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n"), stdout);
+ fputs(_(" -L, --addr-compat-layout changes the way virtual memory is allocated\n"), stdout);
+ fputs(_(" -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n"), stdout);
+ fputs(_(" -B, --32bit turns on ADDR_LIMIT_32BIT\n"), stdout);
+ fputs(_(" -I, --short-inode turns on SHORT_INODE\n"), stdout);
+ fputs(_(" -S, --whole-seconds turns on WHOLE_SECONDS\n"), stdout);
+ fputs(_(" -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n"), stdout);
+ fputs(_(" -3, --3gb limits the used address space to a maximum of 3 GB\n"), stdout);
+ fputs(_(" --4gb ignored (for backward compatibility only)\n"), stdout);
+ fputs(_(" --uname-2.6 turns on UNAME26\n"), stdout);
+ fputs(_(" --list list settable architectures, and exit\n"), stdout);
- printf(USAGE_SEPARATOR);
- printf(USAGE_HELP);
- printf(USAGE_VERSION);
+ fputs(USAGE_SEPARATOR, stdout);
+ fputs(USAGE_HELP, stdout);
+ fputs(USAGE_VERSION, stdout);
printf(USAGE_MAN_TAIL("setarch(8)"));
exit(EXIT_SUCCESS);
--
1.8.2.1
next prev parent reply other threads:[~2013-04-08 19:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 19:32 [PATCH 00/14] [pull] smatch scan, and manual tooling Sami Kerola
2013-04-08 19:32 ` Sami Kerola [this message]
2013-04-08 19:32 ` [PATCH 02/14] bash-completion: setarch: use correct list for architectures Sami Kerola
2013-04-08 19:32 ` [PATCH 03/14] bash-completion: swapon: add options and fix argument Sami Kerola
2013-04-08 19:32 ` [PATCH 04/14] various: fix variable and function declarations [smatch scan] Sami Kerola
2013-04-08 19:32 ` [PATCH 05/14] various: fix shadow " Sami Kerola
2013-04-08 19:32 ` [PATCH 06/14] libmount, col: remove redundant null checks " Sami Kerola
2013-04-08 19:32 ` [PATCH 07/14] libblkid: number of functions should not be declared extern " Sami Kerola
2013-04-08 19:32 ` [PATCH 08/14] tools: add checks to manual page test script Sami Kerola
2013-04-08 19:32 ` [PATCH 09/14] docs: mount.8: make propagation flags adjustable [checkmans.sh] Sami Kerola
2013-04-08 19:32 ` [PATCH 10/14] docs: col.1: fix manual page name section [checkmans.sh] Sami Kerola
2013-04-08 19:32 ` [PATCH 11/14] docs: remove repeated words [checkmans.sh] Sami Kerola
2013-04-08 19:32 ` [PATCH 12/14] tools: make checkmans.sh to find missing manuals Sami Kerola
2013-04-08 19:32 ` [PATCH 13/14] docs: add mkfs.cramfs manual page Sami Kerola
2013-04-08 19:32 ` [PATCH 14/14] docs: add fsck.cramfs " Sami Kerola
2013-04-09 10:30 ` [PATCH 00/14] [pull] smatch scan, and manual tooling Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365449579-13238-2-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox