diff options
| -rw-r--r-- | sbin/mount_nullfs/mount_nullfs.c | 13 | ||||
| -rw-r--r-- | sys/x86/acpica/madt.c | 12 |
2 files changed, 7 insertions, 18 deletions
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index e92680b..e08599f 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -103,25 +103,18 @@ main(int argc, char *argv[]) err(EX_USAGE, "%s", source); if (subdir(target, source) || subdir(source, target)) - errx(EX_USAGE, "%s (%s) and %s are not lldistinct paths", + errx(EX_USAGE, "%s (%s) and %s are not distinct paths", argv[0], target, argv[1]); - printf("Debug: 1\n"); build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1); build_iovec(&iov, &iovlen, "target", target, (size_t)-1); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); - printf("Debug: 2, source: %zd target: %zdd\n", strlen(source), strlen(target)); if (nmount(iov, iovlen, 0) < 0) { - printf("Debug: 3\n"); - if (errmsg[0] != 0) { - printf("Debug 4\n"); + if (errmsg[0] != 0) err(1, "%s: %s", source, errmsg); - } - else { - printf("Debug 5\n"); + else err(1, "%s", source); - } } exit(0); } diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index ef36276..41237ff 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -306,11 +306,10 @@ interrupt_polarity(UINT16 IntiFlags, UINT8 Source) case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); case ACPI_MADT_POLARITY_ACTIVE_LOW: - break; + return (INTR_POLARITY_LOW); default: - printf("WARNING: Bogus Interrupt Polarity. Assume POLALITY LOW"); + panic("Bogus Interrupt Polarity"); } - return (INTR_POLARITY_LOW); } static enum intr_trigger @@ -326,13 +325,10 @@ interrupt_trigger(UINT16 IntiFlags, UINT8 Source) case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); case ACPI_MADT_TRIGGER_LEVEL: - break; + return (INTR_TRIGGER_LEVEL); default: - printf("WARNING: Bogus Interrupt Trigger Mode. Assume Level trigger."); - - break; + panic("Bogus Interrupt Trigger Mode"); } - return (INTR_TRIGGER_LEVEL); } /* |
