d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the error messaging more helpful.

Browse Source 
PR:		31483
Approved by:	iwasaki, ru
MFC after:	4 days
This commit is contained in:
Crist J. Clark 2001-11-30 11:35:01 +00:00
parent bd7142087b
commit 28f49c6daf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=87121
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/acpi/acpiconf/acpiconf.c
View File

@ -33,6 +33,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include <dev/acpica/acpiio.h> #include <dev/acpica/acpiio.h>
@ -49,10 +50,13 @@ acpi_enable_disable(int enable)
fd = open(ACPIDEV, O_RDWR); fd = open(ACPIDEV, O_RDWR);
if (fd == -1) { if (fd == -1) {
err(1, NULL); err(EX_OSFILE, ACPIDEV);
} }
if (ioctl(fd, enable, NULL) == -1) { if (ioctl(fd, enable, NULL) == -1) {
err(1, NULL); if (enable == ACPIIO_ENABLE)
err(EX_IOERR, "enable failed");
else
err(EX_IOERR, "disable failed");
} }
close(fd); close(fd);
@ -66,10 +70,10 @@ acpi_sleep(int sleep_type)
fd = open(ACPIDEV, O_RDWR); fd = open(ACPIDEV, O_RDWR);
if (fd == -1) { if (fd == -1) {
err(1, NULL); err(EX_OSFILE, ACPIDEV);
} }
if (ioctl(fd, ACPIIO_SETSLPSTATE, &sleep_type) == -1) { if (ioctl(fd, ACPIIO_SETSLPSTATE, &sleep_type) == -1) {
err(1, NULL); err(EX_IOERR, "sleep type (%d) failed", sleep_type);
} }
close(fd); close(fd);
@ -107,11 +111,9 @@ main(int argc, char *argv[])
case 's': case 's':
sleep_type = optarg[0] - '0'; sleep_type = optarg[0] - '0';
if (sleep_type < 0 || sleep_type > 5) { if (sleep_type < 0 || sleep_type > 5)
fprintf(stderr, "%s: invalid sleep type (%d)\n", errx(EX_USAGE, "invalid sleep type (%d)",
argv[0], sleep_type); sleep_type);
return -1;
}
break; break;
default: default:
argc -= optind; argc -= optind;