Simplify error handling.

This commit is contained in:
Matt Kraai 2000-12-14 05:44:36 +00:00
parent 95fa0ea3d4
commit aefe5629ab
2 changed files with 8 additions and 16 deletions

12
chvt.c
View File

@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
usage (chvt_usage); usage (chvt_usage);
fd = get_console_fd("/dev/console"); fd = get_console_fd("/dev/console");
num = atoi(argv[1]); num = atoi(argv[1]);
if (ioctl(fd, VT_ACTIVATE, num)) { if (ioctl(fd, VT_ACTIVATE, num))
perror("VT_ACTIVATE"); perror_msg_and_die("VT_ACTIVATE");
return EXIT_FAILURE; if (ioctl(fd, VT_WAITACTIVE, num))
} perror_msg_and_die("VT_WAITACTIVE");
if (ioctl(fd, VT_WAITACTIVE, num)) {
perror("VT_WAITACTIVE");
return EXIT_FAILURE;
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

View File

@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
usage (chvt_usage); usage (chvt_usage);
fd = get_console_fd("/dev/console"); fd = get_console_fd("/dev/console");
num = atoi(argv[1]); num = atoi(argv[1]);
if (ioctl(fd, VT_ACTIVATE, num)) { if (ioctl(fd, VT_ACTIVATE, num))
perror("VT_ACTIVATE"); perror_msg_and_die("VT_ACTIVATE");
return EXIT_FAILURE; if (ioctl(fd, VT_WAITACTIVE, num))
} perror_msg_and_die("VT_WAITACTIVE");
if (ioctl(fd, VT_WAITACTIVE, num)) {
perror("VT_WAITACTIVE");
return EXIT_FAILURE;
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }