summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorSami Kerola2014-09-28 21:51:39 +0200
committerKarel Zak2014-10-01 12:33:23 +0200
commitf6277500833ece8ea34c65e4d23e1454e054141b (patch)
tree87bc29ddf9ecf5c9aaab3a51d20d16fb23c32376 /sys-utils
parentflock: add error message to translations (diff)
downloadkernel-qcow2-util-linux-f6277500833ece8ea34c65e4d23e1454e054141b.tar.gz
kernel-qcow2-util-linux-f6277500833ece8ea34c65e4d23e1454e054141b.tar.xz
kernel-qcow2-util-linux-f6277500833ece8ea34c65e4d23e1454e054141b.zip
textual: use version printing macro everywhere
Only mount, umount, and blkid remains not using the macro because they are print also library references. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/chcpu.c3
-rw-r--r--sys-utils/dmesg.c3
-rw-r--r--sys-utils/hwclock.c2
-rw-r--r--sys-utils/lscpu.c3
-rw-r--r--sys-utils/rtcwake.c3
-rw-r--r--sys-utils/tunelp.c3
6 files changed, 6 insertions, 11 deletions
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index ada0eaacc..aba9d6bc8 100644
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -327,8 +327,7 @@ int main(int argc, char *argv[])
cmd = CMD_CPU_RESCAN;
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/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 71e663253..661aaa9d9 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1332,8 +1332,7 @@ int main(int argc, char *argv[])
setbit(ctl.facilities, n);
break;
case 'V':
- printf(_("%s from %s\n"), program_invocation_short_name,
- PACKAGE_STRING);
+ printf(UTIL_LINUX_VERSION);
return EXIT_SUCCESS;
case 'w':
ctl.follow = 1;
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index d0d422d2f..9151d246e 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1543,7 +1543,7 @@ static int compare_clock (const bool utc, const bool local_opt)
static void out_version(void)
{
- printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+ printf(UTIL_LINUX_VERSION);
}
/*
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 882742443..8ae702865 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1724,8 +1724,7 @@ int main(int argc, char *argv[])
mod->hex = 1;
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/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 51ffb3c5a..e1cd41d3a 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -471,8 +471,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);
exit(EXIT_SUCCESS);
case 'h':
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 7beb8a721..08cef5c37 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -255,8 +255,7 @@ int main(int argc, char **argv)
#endif
case 'v':
case 'V':
- printf(_("%s from %s\n"),
- program_invocation_short_name, PACKAGE_STRING);
+ printf(UTIL_LINUX_VERSION);
return EXIT_SUCCESS;
default:
print_usage(stderr);