remove hardcoded package name from some utils

We have PACKAGE_STRING in config.h that includes package name and
version. It's better to use this macro that hardcoded strings.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index ec3083b3f3ea13f4e3a5dbea9bab1547bd776f95..dc264658f6d03351765897a6b99d9346b110d209 100644 (file)
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -46,7 +46,7 @@ typedef struct blkelv_ioctl_arg_s {
 
 static void
 usage(void) {
-       fprintf(stderr, "elvtune (%s%s)\n", "util-linux-", VERSION);
+       fprintf(stderr, "elvtune (%s)\n", PACKAGE_STRING);
        fprintf(stderr, _("usage:\n"));
        fprintf(stderr, "\telvtune [-r r_lat] [-w w_lat] [-b b_lat]"
                        " /dev/blkdev1 [/dev/blkdev2...]\n");
@@ -58,7 +58,7 @@ usage(void) {
 
 static void
 version(void) {
-       fprintf(stderr, "elvtune (%s%s)\n", "util-linux-", VERSION);
+       fprintf(stderr, "elvtune (%s)\n", PACKAGE_STRING);
 }
 
 #define MAKE_VERSION(p,q,r)    (65536*(p) + 256*(q) + (r))

diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 4b4d3ee82cbf3f94990059c5895bc8d853502bea..bbacf5dc1996ef1de78bbfeb848b3c25c77715b7 100644 (file)
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -1183,7 +1183,7 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
 
 static void
 out_version(void) {
-       printf(_("%s from util-linux-%s\n"), MYNAME, PACKAGE_VERSION);
+       printf(_("%s from %s\n"), MYNAME, PACKAGE_STRING);
 }
 
 /*

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 824735b4aac2f1ed3b3591b889b50abfa954b8ca..579ae8ab5c2ea7de51474da4133931f58137d6a7 100644 (file)
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -186,7 +186,7 @@ int main (int argc, char *argv[])
        }
        if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") ||
            ! strcmp (arg, "--version")) {
-           printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
+           printf(_("%s from %s\n"), progname, PACKAGE_STRING);
            return 0;
        }
        if (! strcmp (arg, "-a")) {