blkid, hwclock, ldattach: use program_invocation_short_name

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index ce712ac53e5dfb36d6d5a711440c6ed8dab65061..f4a9cf5a4ae1f7e0c06eb7cf2d7fc9a77067b1df 100644 (file)
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -51,8 +51,6 @@ extern int optind;
 #include "ttyutils.h"
 #include "xalloc.h"
 
-const char *progname = "blkid";
-
 int raw_chars;
 
 static void print_version(FILE *out)
@@ -98,7 +96,7 @@ static void usage(int error)
                " -O <offset> probe at the given offset\n"
                " -u <list>   filter by \"usage\" (e.g. -u filesystem,raid)\n"
                " -n <list>   filter by filesystem type (e.g. -n vfat,ext3)\n"
-               "\n", progname);
+               "\n", program_invocation_short_name);
 
        exit(error);
 }

diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h
index 175a6d1ae8452bd724ba91f803a0de1fda32554e..69b0ce200d807852857e5a39ac25974fafaa42f3 100644 (file)
--- a/sys-utils/hwclock.h
+++ b/sys-utils/hwclock.h
@@ -24,7 +24,6 @@ extern struct clock_ops *probe_for_kd_clock(void);
 typedef int bool;
 
 /* hwclock.c */
-extern char *progname;
 extern int debug;
 extern unsigned long epoch_option;
 extern double time_diff(struct timeval subtrahend, struct timeval subtractor);

diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index c06aed2049e2eb080a43fea0dc0ff24fad0e60d1..5c460feeffec7adad8d39787f80f9428deee7126 100644 (file)
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -42,7 +42,6 @@
 # define TIOCSETD   0x5423
 #endif
 
-static const char *progname;
 static int debug = 0;
 
 struct ld_table {
@@ -238,8 +237,6 @@ int main(int argc, char **argv)
        atexit(close_stdout);
 
        /* parse options */
-       progname = program_invocation_short_name;
-
        if (argc == 0)
                usage(EXIT_SUCCESS);
        while ((optc =