X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=chvt.c;h=c76e9c7806b851fec62933de3ed96f3a7eb11dc0;hb=e5f39576650933770153e82c63a46f27fcd72b0e;hp=7909645868c05a867ca8a7055c6f48e9dc2f198d;hpb=3e856ce428cabaf6c8d99a2374a1f9a4a05db5f0;p=oweals%2Fbusybox.git

diff --git a/chvt.c b/chvt.c
index 790964586..c76e9c780 100644
--- a/chvt.c
+++ b/chvt.c
@@ -4,33 +4,32 @@
  *
  * busyboxed by Erik Andersen
  */
-#include "busybox.h"
+
+/* getopt not needed */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 /* From <linux/vt.h> */
-#define VT_ACTIVATE     0x5606  /* make vt active */
-#define VT_WAITACTIVE   0x5607  /* wait for vt active */
+static const int VT_ACTIVATE = 0x5606;  /* make vt active */
+static const int VT_WAITACTIVE = 0x5607;  /* wait for vt active */
 
 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)) {
-		perror("VT_ACTIVATE");
-		return EXIT_FAILURE;
-	}
-	if (ioctl(fd, VT_WAITACTIVE, num)) {
-		perror("VT_WAITACTIVE");
-		return EXIT_FAILURE;
-	}
+	if (ioctl(fd, VT_ACTIVATE, num))
+		perror_msg_and_die("VT_ACTIVATE");
+	if (ioctl(fd, VT_WAITACTIVE, num))
+		perror_msg_and_die("VT_WAITACTIVE");
 	return EXIT_SUCCESS;
 }