Simplify error handling.

git-svn-id: svn://busybox.net/trunk/busybox@1458 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 8 insertions, 16 deletions

diff --git a/chvt.c b/chvt.c
index 790964586..76d4b53a6 100644
--- a/chvt.c
+++ b/chvt.c
@@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
                 usage (chvt_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;
 }
 
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 790964586..76d4b53a6 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
                 usage (chvt_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;
 }