From 3bd8bd89ee9d0b65bf279e1ecad826a5f2f0a217 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Fri, 14 Jul 2000 23:28:47 +0000 Subject: Don't use strings directly in calls to usage(). This is in preparation for their extraction to a separate file. --- console-tools/chvt.c | 15 ++++++++------- console-tools/deallocvt.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'console-tools') diff --git a/console-tools/chvt.c b/console-tools/chvt.c index c5c86b613..ab0e9218f 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -15,18 +15,19 @@ #define VT_ACTIVATE 0x5606 /* make vt active */ #define VT_WAITACTIVE 0x5607 /* wait for vt active */ +const char chvt_usage[] = + "chvt N\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nChanges the foreground virtual terminal to /dev/ttyN\n" +#endif + ; int chvt_main(int argc, char **argv) { int fd, num; - if ((argc != 2) || (**(argv + 1) == '-')) { - usage ("chvt N\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nChanges the foreground virtual terminal to /dev/ttyN\n" -#endif - ); - } + if ((argc != 2) || (**(argv + 1) == '-')) + usage (chvt_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 906f3a9fa..042de8649 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c @@ -13,19 +13,19 @@ /* From */ #define VT_DISALLOCATE 0x5608 /* free memory associated to vt */ +const char deallocvt_usage[] = + "deallocvt N\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nDeallocate unused virtual terminal /dev/ttyN\n" +#endif + ; int deallocvt_main(int argc, char *argv[]) { int fd, num, i; - if ((argc != 2) || (**(argv + 1) == '-')) { - usage - ("deallocvt N\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nDeallocate unused virtual terminal /dev/ttyN\n" -#endif - ); - } + if ((argc != 2) || (**(argv + 1) == '-')) + usage(deallocvt_usage); fd = get_console_fd("/dev/console"); -- cgit v1.2.3