From 4e93a7f238ed08f835aee939c73ec968d740aa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 28 Aug 2006 10:20:45 +0000 Subject: [PATCH] fixed some warnings git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18659 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/scsi/scsi_io.c | 4 ++-- src/system/kernel/arch/x86/arch_int.c | 10 +++++----- src/system/kernel/heap.c | 2 +- src/system/kernel/thread.c | 4 ++-- src/system/kernel/vm/vm_page.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/scsi/scsi_io.c b/src/add-ons/kernel/bus_managers/scsi/scsi_io.c index 1eecc192b5..6c1b57ef1d 100644 --- a/src/add-ons/kernel/bus_managers/scsi/scsi_io.c +++ b/src/add-ons/kernel/bus_managers/scsi/scsi_io.c @@ -251,12 +251,12 @@ scsi_request_finished(scsi_ccb *request, uint num_requests) SHOW_FLOW(3, "%p", request); if (request->state != SCSI_STATE_SENT) { - panic("Unsent ccb 0x%x was reported as done\n", request); + panic("Unsent ccb %p was reported as done\n", request); return; } if (request->subsys_status == SCSI_REQ_INPROG) { - panic("ccb 0x%xwith status \"Request in Progress\" was reported as done\n", + panic("ccb %p with status \"Request in Progress\" was reported as done\n", request); return; } diff --git a/src/system/kernel/arch/x86/arch_int.c b/src/system/kernel/arch/x86/arch_int.c index a9d677f4c9..a4153c4f4b 100644 --- a/src/system/kernel/arch/x86/arch_int.c +++ b/src/system/kernel/arch/x86/arch_int.c @@ -322,7 +322,7 @@ static void fatal_exception(struct iframe *frame) { char name[32]; - panic("Fatal exception \"%s\" occurred! Error code: 0x%x\n", + panic("Fatal exception \"%s\" occurred! Error code: 0x%lx\n", exception_name(frame->vector, name, sizeof(name)), frame->error_code); } @@ -339,7 +339,7 @@ unexpected_exception(struct iframe *frame, debug_exception_type type, } else { char name[32]; panic("Unexpected exception \"%s\" occurred in kernel mode! " - "Error code: 0x%x\n", + "Error code: 0x%lx\n", exception_name(frame->vector, name, sizeof(name)), frame->error_code); } @@ -393,7 +393,7 @@ i386_handle_trap(struct iframe frame) frame.esp = tss->esp; frame.flags = tss->eflags; - panic("double fault! errorcode = 0x%x\n", frame.error_code); + panic("double fault! errorcode = 0x%lx\n", frame.error_code); break; } @@ -542,8 +542,8 @@ i386_handle_trap(struct iframe frame) pic_end_of_interrupt(frame.vector); } else { char name[32]; - panic("i386_handle_trap: unhandled trap 0x%x (%s) at ip 0x%x, " - "thread 0x%x!\n", frame.vector, + panic("i386_handle_trap: unhandled trap 0x%lx (%s) at ip 0x%lx, " + "thread 0x%lx!\n", frame.vector, exception_name(frame.vector, name, sizeof(name)), frame.eip, thread ? thread->id : -1); ret = B_HANDLED_INTERRUPT; diff --git a/src/system/kernel/heap.c b/src/system/kernel/heap.c index 2fd9ae9d7c..4258753475 100644 --- a/src/system/kernel/heap.c +++ b/src/system/kernel/heap.c @@ -559,7 +559,7 @@ free(void *address) bin = &bins[page[0].bin_index]; if (bin->element_size <= B_PAGE_SIZE && (addr_t)address % bin->element_size != 0) - panic("kfree: passed invalid pointer %p! Supposed to be in bin for esize 0x%x\n", address, bin->element_size); + panic("kfree: passed invalid pointer %p! Supposed to be in bin for esize 0x%lx\n", address, bin->element_size); #if PARANOID_KFREE // mark the free space as freed diff --git a/src/system/kernel/thread.c b/src/system/kernel/thread.c index 5048a52269..30d552a32e 100644 --- a/src/system/kernel/thread.c +++ b/src/system/kernel/thread.c @@ -810,10 +810,10 @@ put_death_stack(uint32 index) TRACE(("put_death_stack...: passed %lu\n", index)); if (index >= sNumDeathStacks) - panic("put_death_stack: passed invalid stack index %d\n", index); + panic("put_death_stack: passed invalid stack index %ld\n", index); if (!(sDeathStackBitmap & (1 << index))) - panic("put_death_stack: passed invalid stack index %d\n", index); + panic("put_death_stack: passed invalid stack index %ld\n", index); state = disable_interrupts(); diff --git a/src/system/kernel/vm/vm_page.c b/src/system/kernel/vm/vm_page.c index 7d5c21b7cc..441b42e1c0 100644 --- a/src/system/kernel/vm/vm_page.c +++ b/src/system/kernel/vm/vm_page.c @@ -960,7 +960,7 @@ dump_page_stats(int argc, char **argv) for (i = 0; i < sNumPages; i++) { if (sPages[i].state > 7) - panic("page %i at %p has invalid state!\n", i, &sPages[i]); + panic("page %li at %p has invalid state!\n", i, &sPages[i]); counter[sPages[i].state]++; }