diff options
author | Sami Kerola | 2011-09-17 12:52:32 +0200 |
---|---|---|
committer | Sami Kerola | 2011-09-17 15:07:52 +0200 |
commit | 6f162034d0fc9a49ab1dcf2b773fa9677215cba3 (patch) | |
tree | e6f0572f92578723a0c385cb6acd12b4aca13960 /sys-utils | |
parent | ipcrm: check IPC syscalls (diff) | |
download | kernel-qcow2-util-linux-6f162034d0fc9a49ab1dcf2b773fa9677215cba3.tar.gz kernel-qcow2-util-linux-6f162034d0fc9a49ab1dcf2b773fa9677215cba3.tar.xz kernel-qcow2-util-linux-6f162034d0fc9a49ab1dcf2b773fa9677215cba3.zip |
build-sys: fixes to USAGE_* macros
The USAGE_BEGIN_TAIL is removed as unnecessary.
In between command specific options and --help & --version
USAGE_SEPARATOR is inserted. For now the separator is empty line.
The USAGE_MAN_TAIL is changed to take an argument.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
-rw-r--r-- | sys-utils/arch.c | 5 | ||||
-rw-r--r-- | sys-utils/ctrlaltdel.c | 4 | ||||
-rw-r--r-- | sys-utils/ipcmk.c | 4 | ||||
-rw-r--r-- | sys-utils/ipcrm.c | 4 | ||||
-rw-r--r-- | sys-utils/ipcs.c | 3 | ||||
-rw-r--r-- | sys-utils/pivot_root.c | 4 |
6 files changed, 11 insertions, 13 deletions
diff --git a/sys-utils/arch.c b/sys-utils/arch.c index 47aad7c97..f8b795cea 100644 --- a/sys-utils/arch.c +++ b/sys-utils/arch.c @@ -33,11 +33,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, " %s\n", program_invocation_short_name); fprintf(out, USAGE_OPTIONS); /* Additional options to here. */ + fprintf(out, USAGE_SEPARATOR); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); - fprintf(out, USAGE_BEGIN_TAIL); - /* Remove USAGE_MAN_TAIL line when man page does not exist. */ - fprintf(out, USAGE_MAN_TAIL, "arch(1)"); + fprintf(out, USAGE_MAN_TAIL("arch(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index 8805435d4..db96fccc4 100644 --- a/sys-utils/ctrlaltdel.c +++ b/sys-utils/ctrlaltdel.c @@ -19,10 +19,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, USAGE_HEADER); fprintf(out, _(" %s <hard|soft>\n"), program_invocation_short_name); fprintf(out, USAGE_OPTIONS); + fprintf(out, USAGE_SEPARATOR); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); - fprintf(out, USAGE_BEGIN_TAIL); - fprintf(out, USAGE_MAN_TAIL, "ctrlaltdel(8)"); + fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c index c91908bde..f4bee83f7 100644 --- a/sys-utils/ipcmk.c +++ b/sys-utils/ipcmk.c @@ -71,10 +71,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fputs(_(" -Q, --queue create message queue\n"), out); fputs(_(" -p, --mode <mode> permission for the resource (default is 0644)\n"), out); + fprintf(out, USAGE_SEPARATOR); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); - fprintf(out, USAGE_BEGIN_TAIL); - fprintf(out, USAGE_MAN_TAIL, "ipcmk(1)"); + fprintf(out, USAGE_MAN_TAIL("ipcmk(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c index ab06cd3cd..90767d611 100644 --- a/sys-utils/ipcrm.c +++ b/sys-utils/ipcrm.c @@ -57,10 +57,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fputs(_(" -S, --semaphore-key <key> remove semaprhore by key\n"), out); fputs(_(" -a, --all[=<shm|msg|sem>] remove all\n"), out); fputs(_(" -v, --verbose explain what is being done\n"), out); + fprintf(out, USAGE_SEPARATOR); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); - fprintf(out, USAGE_BEGIN_TAIL); - fprintf(out, USAGE_MAN_TAIL, "ipcrm(1)"); + fprintf(out, USAGE_MAN_TAIL("ipcrm(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 09764b656..c21792141 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -134,8 +134,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fputs(_(" -c, --creator show creator and owner\n"), out); fputs(_(" -l, --limits show resource limits\n"), out); fputs(_(" -u, --summary show status summary\n"), out); - fprintf(out, USAGE_BEGIN_TAIL); - fprintf(out, USAGE_MAN_TAIL, "ipcs(1)"); + fprintf(out, USAGE_MAN_TAIL("ipcs(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c index 8669748a1..db8e02f0c 100644 --- a/sys-utils/pivot_root.c +++ b/sys-utils/pivot_root.c @@ -31,10 +31,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, USAGE_HEADER); fprintf(out, _(" %s [options] new_root put_old\n"), program_invocation_short_name); + fprintf(out, USAGE_SEPARATOR); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); - fprintf(out, USAGE_BEGIN_TAIL); - fprintf(out, USAGE_MAN_TAIL, "pivot_root(8)"); + fprintf(out, USAGE_MAN_TAIL("pivot_root(8)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } |