This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

7 files changed, 7 insertions, 7 deletions

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index c715e67de..f2e6d5f17 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -20,7 +20,7 @@ int chvt_main(int argc, char **argv)
         int fd, num;
 
         if ((argc != 2) || (**(argv + 1) == '-'))
-                usage (chvt_usage);
+                show_usage();
         fd = get_console_fd("/dev/console");
         num = atoi(argv[1]);
         if (ioctl(fd, VT_ACTIVATE, num))
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index b51fbaef4..8c390c261 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -19,7 +19,7 @@ int deallocvt_main(int argc, char *argv[])
 
         //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
         if (argc > 2)
-                usage(deallocvt_usage);
+                show_usage();
 
         fd = get_console_fd("/dev/console");
 
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 4ab711e55..b9f1bd233 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -48,7 +48,7 @@ int dumpkmap_main(int argc, char **argv)
         char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
 
         if (argc>=2 && *argv[1]=='-') {
-                usage(dumpkmap_usage);
+                show_usage();
         }
 
         fd = open("/dev/tty0", O_RDWR);
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 345a2773c..6422137a1 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -34,7 +34,7 @@ int loadacm_main(int argc, char **argv)
         int fd;
 
         if (argc>=2 && *argv[1]=='-') {
-                usage(loadacm_usage);
+                show_usage();
         }
 
         fd = open("/dev/tty", O_RDWR);
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index ec3e50560..d7bd7e8f5 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -44,7 +44,7 @@ extern int loadfont_main(int argc, char **argv)
         int fd;
 
         if (argc != 1)
-                usage(loadfont_usage);
+                show_usage();
 
         fd = open("/dev/tty0", O_RDWR);
         if (fd < 0)
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index a98601aec..5ecd819f9 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -51,7 +51,7 @@ int loadkmap_main(int argc, char **argv)
         char flags[MAX_NR_KEYMAPS], buff[7];
 
         if (argc != 1)
-                usage(loadkmap_usage);
+                show_usage();
 
         fd = open("/dev/tty0", O_RDWR);
         if (fd < 0)
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 3e511ad00..0be4724ca 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -43,7 +43,7 @@ setkeycodes_main(int argc, char** argv)
     struct kbkeycode a;
 
     if (argc % 2 != 1 || argc < 2) {
-      usage(setkeycodes_usage);
+      show_usage();
         }
          
         fd = get_console_fd("/dev/console");