From: Karel Zak Date: Fri, 25 Jan 2013 11:05:26 +0000 (+0100) Subject: textual: use UTIL_LINUX_VERSION everywhere X-Git-Tag: v2.23-rc1~301 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e421313dc253856af67cc267d2b33f856f18b0e3;p=thirdparty%2Futil-linux.git textual: use UTIL_LINUX_VERSION everywhere Signed-off-by: Karel Zak --- diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c index eb347b79b5..4543818bd4 100644 --- a/disk-utils/blockdev.c +++ b/disk-utils/blockdev.c @@ -229,8 +229,7 @@ int main(int argc, char **argv) /* -V not together with commands */ if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) { - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; } if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c index 6aa01a2909..aa13c063a2 100644 --- a/disk-utils/elvtune.c +++ b/disk-utils/elvtune.c @@ -64,8 +64,7 @@ usage(void) { static void version(void) { - fprintf(stderr, _("%s from %s\n"), - program_invocation_short_name, PACKAGE_STRING); + fprintf(stderr, UTIL_LINUX_VERSION); } int diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c index e937a8ed51..509a6055b9 100644 --- a/disk-utils/fdformat.c +++ b/disk-utils/fdformat.c @@ -128,8 +128,7 @@ int main(int argc, char **argv) verify = 0; break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); case 'h': usage(stdout); diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c index 28a1d706b3..16746ab14f 100644 --- a/disk-utils/fsck.c +++ b/disk-utils/fsck.c @@ -1504,7 +1504,7 @@ int main(int argc, char *argv[]) parse_argv(argc, argv); if (!notitle) - printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); load_fs_info(); diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index d83f9e0828..0a296f32ad 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -86,7 +86,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) static void __attribute__ ((__noreturn__)) print_version(void) { - printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); } diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 1929a9072a..55506c0559 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -57,8 +57,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) static void __attribute__ ((__noreturn__)) print_version(void) { - printf(_("%s from %s\n"), - program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); } @@ -128,8 +127,7 @@ int main(int argc, char **argv) argv[--optind] = progname; if (verbose) { - printf(_("%s from %s\n"), - program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); i = optind; while (argv[i]) printf("%s ", argv[i++]); diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index f504a32360..8abc0455dd 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -760,8 +760,7 @@ int main(int argc, char **argv) /* old option, ignored */ break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit(MKFS_EX_OK); case 'v': verbose = 1; diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c index e59d52a2b1..d98df9a96a 100644 --- a/fdisks/sfdisk.c +++ b/fdisks/sfdisk.c @@ -2623,8 +2623,7 @@ main(int argc, char **argv) { set_format(*optarg); break; case 'v': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/cal.c b/misc-utils/cal.c index 0e204b99f3..3a82c81aca 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -350,8 +350,7 @@ main(int argc, char **argv) { yflag = 1; break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c index 8de469b1b2..9e94452e78 100644 --- a/misc-utils/getopt.c +++ b/misc-utils/getopt.c @@ -428,9 +428,7 @@ int main(int argc, char *argv[]) quote = 0; break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case '?': case ':': diff --git a/misc-utils/kill.c b/misc-utils/kill.c index 6abfd24a11..8c06a456ad 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -190,7 +190,7 @@ int main (int argc, char *argv[]) } if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") || ! strcmp (arg, "--version")) { - printf(_("%s from %s\n"), progname, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return 0; } if (! strcmp (arg, "-a")) { diff --git a/misc-utils/logger.c b/misc-utils/logger.c index ecdbfe372a..63cd35598a 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -261,8 +261,7 @@ main(int argc, char **argv) { udpport = optarg; break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); case 'h': usage(stdout); diff --git a/misc-utils/look.c b/misc-utils/look.c index 7bbec1b206..83a4ee9c23 100644 --- a/misc-utils/look.c +++ b/misc-utils/look.c @@ -123,9 +123,7 @@ main(int argc, char *argv[]) termchar = *optarg; break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 8ee69748f1..26d7f505a5 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1506,8 +1506,7 @@ int main(int argc, char *argv[]) columns[ncolumns++] = COL_TRANSPORT; break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; default: help(stderr); diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c index b7b1762dc5..e9fdfd1a10 100644 --- a/misc-utils/mcookie.c +++ b/misc-utils/mcookie.c @@ -116,9 +116,7 @@ int main(int argc, char **argv) file = optarg; break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/namei.c b/misc-utils/namei.c index 97c5d43d26..048ac42b38 100644 --- a/misc-utils/namei.c +++ b/misc-utils/namei.c @@ -463,8 +463,7 @@ main(int argc, char **argv) usage(EXIT_SUCCESS); break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'l': flags |= (NAMEI_OWNERS | NAMEI_MODES | NAMEI_VERTICAL); diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index 3dde49e1b7..668aac7a3f 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -577,9 +577,7 @@ int main(int argc, char **argv) } break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c index 6c22fce64e..450e26a053 100644 --- a/misc-utils/uuidgen.c +++ b/misc-utils/uuidgen.c @@ -74,9 +74,7 @@ main (int argc, char *argv[]) do_type = DO_TYPE_RANDOM; break; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c index 095ca6282d..3528d62664 100644 --- a/misc-utils/whereis.c +++ b/misc-utils/whereis.c @@ -464,9 +464,7 @@ main(int argc, char **argv) mflag++; continue; case 'V': - printf(_("%s from %s\n"), - program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': usage(stdout); diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index a29f3ccf80..9fbfda9960 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -445,8 +445,7 @@ main(int argc, char **argv) type_pattern = optarg; break; case 'V': - printf(_("%s from %s\n"), program_invocation_short_name, - PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; default: usage(stderr); diff --git a/mount-deprecated/umount.c b/mount-deprecated/umount.c index da3b05b819..97a76811d9 100644 --- a/mount-deprecated/umount.c +++ b/mount-deprecated/umount.c @@ -811,8 +811,7 @@ main (int argc, char *argv[]) { ++verbose; break; case 'V': /* version */ - printf(_("%s from %s\n"), - program_invocation_short_name, PACKAGE_STRING); + printf(UTIL_LINUX_VERSION); exit (0); case 't': /* specify file system type */ types = optarg;