From 9200ccec5ae747fe921b960e7799aecd55d7ee6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 5 Apr 2009 08:01:23 +0000 Subject: [PATCH] * That must have been a BeOS limitation, at least our kernel sports the same generic API for each architecture. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29919 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../server/beos/beos_kernel_emu.cpp | 11 ++----- .../userlandfs/server/kernel_emu.cpp | 30 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp index 8fc8bef1a3..f92d450c00 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp @@ -338,17 +338,12 @@ panic(const char *format, ...) char buffer[1024]; strcpy(buffer, "PANIC: "); int32 prefixLen = strlen(buffer); + va_list args; va_start(args, format); - // no vsnprintf() on PPC - #if defined(__INTEL__) - int bufferSize = sizeof(buffer) - prefixLen; - vsnprintf(buffer + prefixLen, bufferSize - 1, format, args); - #else - vsprintf(buffer + prefixLen, format, args); - #endif + vsnprintf(buffer + prefixLen, sizeof(buffer) - prefixLen, format, args); va_end(args); - buffer[sizeof(buffer) - 1] = '\0'; + debugger(buffer); } diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp index 8167991f53..de2152da16 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp @@ -900,36 +900,6 @@ UserlandFS::KernelEmu::kernel_debugger(const char *message) debugger(message); } -// vpanic -void -UserlandFS::KernelEmu::vpanic(const char *format, va_list args) -{ - char buffer[1024]; - strcpy(buffer, "PANIC: "); - int32 prefixLen = strlen(buffer); - - // no vsnprintf() on PPC - #if defined(__INTEL__) - int bufferSize = sizeof(buffer) - prefixLen; - vsnprintf(buffer + prefixLen, bufferSize - 1, format, args); - #else - vsprintf(buffer + prefixLen, format, args); - #endif - - buffer[sizeof(buffer) - 1] = '\0'; - debugger(buffer); -} - -// panic -void -UserlandFS::KernelEmu::panic(const char *format, ...) -{ - va_list args; - va_start(args, format); - vpanic(format, args); - va_end(args); -} - // vdprintf void UserlandFS::KernelEmu::vdprintf(const char *format, va_list args)