From f45f3ec34a37e2779d09625b93be5eb91174f8fc Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Thu, 29 Jun 2017 15:52:16 +0200 Subject: misc: consolidate macro style USAGE_HELP_OPTIONS changed in include/c.h and applied via sed: sed -i 's/fprintf.*\(USAGE_MAN_TAIL.*\)/printf(\1/' $(git ls-files -- "*.c") sed -i 's/print_usage_help_options\(.*\);/printf(USAGE_HELP_OPTIONS\1);/' $(git ls-files -- "*.c") Signed-off-by: Ruediger Meier --- disk-utils/addpart.c | 4 ++-- disk-utils/blockdev.c | 2 +- disk-utils/cfdisk.c | 4 ++-- disk-utils/delpart.c | 4 ++-- disk-utils/fdformat.c | 4 ++-- disk-utils/fdisk.c | 4 ++-- disk-utils/fsck.c | 2 +- disk-utils/fsck.cramfs.c | 2 +- disk-utils/fsck.minix.c | 4 ++-- disk-utils/isosize.c | 4 ++-- disk-utils/mkfs.bfs.c | 4 ++-- disk-utils/mkfs.c | 4 ++-- disk-utils/mkfs.cramfs.c | 2 +- disk-utils/mkfs.minix.c | 4 ++-- disk-utils/mkswap.c | 2 +- disk-utils/partx.c | 4 ++-- disk-utils/raw.c | 4 ++-- disk-utils/resizepart.c | 4 ++-- disk-utils/sfdisk.c | 2 +- disk-utils/swaplabel.c | 4 ++-- 20 files changed, 34 insertions(+), 34 deletions(-) (limited to 'disk-utils') diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c index e793ae03f..018c99585 100644 --- a/disk-utils/addpart.c +++ b/disk-utils/addpart.c @@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel about the existence of a specified partition.\n"), out); fputs(USAGE_OPTIONS, out); - print_usage_help_options(16); - fprintf(out, USAGE_MAN_TAIL("addpart(8)")); + printf(USAGE_HELP_OPTIONS(16)); + printf(USAGE_MAN_TAIL("addpart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c index 976d41628..f1ea53347 100644 --- a/disk-utils/blockdev.c +++ b/disk-utils/blockdev.c @@ -197,7 +197,7 @@ static void __attribute__((__noreturn__)) usage(void) puts( _(" -v verbose mode")); puts( _(" --report print report for specified (or all) devices")); fputs(USAGE_SEPARATOR, stdout); - print_usage_help_options(16); + printf(USAGE_HELP_OPTIONS(16)); fputs(USAGE_SEPARATOR, stdout); puts( _("Available commands:")); diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index 6bacc60f3..00c512e49 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -2559,9 +2559,9 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -z, --zero start with zeroed partition table\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(26); + printf(USAGE_HELP_OPTIONS(26)); - fprintf(out, USAGE_MAN_TAIL("cfdisk(8)")); + printf(USAGE_MAN_TAIL("cfdisk(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c index 83cd1ce46..dc069970d 100644 --- a/disk-utils/delpart.c +++ b/disk-utils/delpart.c @@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel to forget about a specified partition.\n"), out); fputs(USAGE_OPTIONS, out); - print_usage_help_options(16); - fprintf(out, USAGE_MAN_TAIL("delpart(8)")); + printf(USAGE_HELP_OPTIONS(16)); + printf(USAGE_MAN_TAIL("delpart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c index f84b84733..f461c82e1 100644 --- a/disk-utils/fdformat.c +++ b/disk-utils/fdformat.c @@ -156,8 +156,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -n, --no-verify disable the verification after the format\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(19); - fprintf(out, USAGE_MAN_TAIL("fdformat(8)")); + printf(USAGE_HELP_OPTIONS(19)); + printf(USAGE_MAN_TAIL("fdformat(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index 937304c7e..56c8d63ac 100644 --- a/disk-utils/fdisk.c +++ b/disk-utils/fdisk.c @@ -785,11 +785,11 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -S, --sectors specify the number of sectors per track\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(31); + printf(USAGE_HELP_OPTIONS(31)); list_available_columns(out); - fprintf(out, USAGE_MAN_TAIL("fdisk(8)")); + printf(USAGE_MAN_TAIL("fdisk(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c index 3fe3959c1..58fd8ac59 100644 --- a/disk-utils/fsck.c +++ b/disk-utils/fsck.c @@ -1398,7 +1398,7 @@ static void __attribute__((__noreturn__)) usage(void) printf( " --version %s\n", USAGE_OPTSTR_VERSION); fputs(USAGE_SEPARATOR, out); fputs(_("See the specific fsck.* commands for available fs-options."), out); - fprintf(out, USAGE_MAN_TAIL("fsck(8)")); + printf(USAGE_MAN_TAIL("fsck(8)")); exit(FSCK_EX_OK); } diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 465685278..50c7d33b9 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -120,7 +120,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -b, --blocksize use this blocksize, defaults to page size\n"), out); fputs(_(" --extract[=] test uncompression, optionally extract into \n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(26); + printf(USAGE_HELP_OPTIONS(26)); printf(USAGE_MAN_TAIL("fsck.cramfs(8)")); exit(FSCK_EX_OK); diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index a96f77f6f..b978684a8 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -192,8 +192,8 @@ usage(void) { fputs(_(" -m, --uncleared activate mode not cleared warnings\n"), out); fputs(_(" -f, --force force check\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(18); - fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)")); + printf(USAGE_HELP_OPTIONS(18)); + printf(USAGE_MAN_TAIL("fsck.minix(8)")); exit(FSCK_EX_OK); } diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c index 2b2e1ee66..5fbbbfc76 100644 --- a/disk-utils/isosize.c +++ b/disk-utils/isosize.c @@ -141,8 +141,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -d, --divisor= divide the amount of bytes by \n"), out); fputs(_(" -x, --sectors show sector count and size\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(25); - fprintf(out, USAGE_MAN_TAIL("isosize(8)")); + printf(USAGE_HELP_OPTIONS(25)); + printf(USAGE_MAN_TAIL("isosize(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index fbf2887ca..5bf8fdfd8 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -85,9 +85,9 @@ static void __attribute__((__noreturn__)) usage(void) " -c this option is silently ignored\n" " -l this option is silently ignored\n" )); - print_usage_help_options(21); + printf(USAGE_HELP_OPTIONS(21)); - fprintf(out, USAGE_MAN_TAIL("mkfs.bfs(8)")); + printf(USAGE_MAN_TAIL("mkfs.bfs(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index f7b0c0a09..5bcd9613c 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -55,9 +55,9 @@ static void __attribute__((__noreturn__)) usage(void) fprintf(out, _(" number of blocks to be used on the device\n")); fprintf(out, _(" -V, --verbose explain what is being done;\n" " specifying -V more than once will cause a dry-run\n")); - print_usage_help_options(20); + printf(USAGE_HELP_OPTIONS(20)); - fprintf(out, USAGE_MAN_TAIL("mkfs(8)")); + printf(USAGE_MAN_TAIL("mkfs(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index ec83f48da..a3e9aa48c 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -143,7 +143,7 @@ static void __attribute__((__noreturn__)) usage(void) program_invocation_short_name, PAD_SIZE); fputs(USAGE_SEPARATOR, stdout); - print_usage_help_options(16); + printf(USAGE_HELP_OPTIONS(16)); printf(USAGE_MAN_TAIL("mkfs.cramfs(8)")); exit(MKFS_EX_OK); } diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index e77d0b89f..54c47da7e 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -145,8 +145,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -c, --check check the device for bad blocks\n"), out); fputs(_(" -l, --badblocks list of bad blocks from file\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(25); - fprintf(out, USAGE_MAN_TAIL("mkfs.minix(8)")); + printf(USAGE_HELP_OPTIONS(25)); + printf(USAGE_MAN_TAIL("mkfs.minix(8)")); exit(MKFS_EX_OK); } diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 593a61e03..748e241cf 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -161,7 +161,7 @@ static void __attribute__((__noreturn__)) usage(void) " -v, --swapversion NUM specify swap-space version number\n" " -U, --uuid UUID specify the uuid to use\n" )); - print_usage_help_options(27); + printf(USAGE_HELP_OPTIONS(27)); printf(USAGE_MAN_TAIL("mkswap(8)")); exit(EXIT_SUCCESS); diff --git a/disk-utils/partx.c b/disk-utils/partx.c index 474c80e46..43a6448db 100644 --- a/disk-utils/partx.c +++ b/disk-utils/partx.c @@ -773,13 +773,13 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - print_usage_help_options(22); + printf(USAGE_HELP_OPTIONS(22)); fputs(USAGE_COLUMNS, out); for (i = 0; i < NCOLS; i++) fprintf(out, " %10s %s\n", infos[i].name, _(infos[i].help)); - fprintf(out, USAGE_MAN_TAIL("partx(8)")); + printf(USAGE_MAN_TAIL("partx(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/raw.c b/disk-utils/raw.c index 1de7f813e..8abcbb747 100644 --- a/disk-utils/raw.c +++ b/disk-utils/raw.c @@ -59,8 +59,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_OPTIONS, out); fputs(_(" -q, --query set query mode\n"), out); fputs(_(" -a, --all query all raw devices\n"), out); - print_usage_help_options(16); - fprintf(out, USAGE_MAN_TAIL("raw(8)")); + printf(USAGE_HELP_OPTIONS(16)); + printf(USAGE_MAN_TAIL("raw(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c index 38e7cacea..15aa01b8f 100644 --- a/disk-utils/resizepart.c +++ b/disk-utils/resizepart.c @@ -24,8 +24,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel about the new size of a partition.\n"), out); fputs(USAGE_OPTIONS, out); - print_usage_help_options(16); - fprintf(out, USAGE_MAN_TAIL("resizepart(8)")); + printf(USAGE_HELP_OPTIONS(16)); + printf(USAGE_MAN_TAIL("resizepart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 8616ee950..c3a97a479 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1906,7 +1906,7 @@ static void __attribute__((__noreturn__)) usage(void) list_available_columns(out); - fprintf(out, USAGE_MAN_TAIL("sfdisk(8)")); + printf(USAGE_MAN_TAIL("sfdisk(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c index c4e6873c0..7785bcebc 100644 --- a/disk-utils/swaplabel.c +++ b/disk-utils/swaplabel.c @@ -125,8 +125,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -L, --label