From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 13 Apr 2013 19:54:30 +0000 (+0100)
Subject: blkid, hwclock, ldattach: use program_invocation_short_name
X-Git-Tag: v2.24-rc1~606
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0ed8dc2b99eb660b9e419d1c134ebc4ad0868bd;p=thirdparty%2Futil-linux.git

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 ce712ac53e..f4a9cf5a4a 100644
--- 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 175a6d1ae8..69b0ce200d 100644
--- 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 c06aed2049..5c460feeff 100644
--- 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 =