From 902425896d6b7f001f68d54708884e2727b837fc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 21 Jan 2008 00:15:33 +0000 Subject: [PATCH] Made kputs() available in the kernel and used it for printing debugger command usage texts, which can be too long for kprintf(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23677 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/debug.h | 1 + src/system/kernel/debug/debug.cpp | 2 +- src/system/kernel/debug/debug_commands.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h index 020e2c8186..404b7b7264 100644 --- a/headers/private/kernel/debug.h +++ b/headers/private/kernel/debug.h @@ -56,6 +56,7 @@ extern void debug_puts(const char *s, int32 length); extern bool debug_debugger_running(void); extern void debug_stop_screen_debug_output(void); +extern void kputs(const char *string); extern void dprintf_no_syslog(const char *format, ...) __attribute__ ((format (__printf__, 1, 2))); diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp index c7d812af41..f4a2966050 100644 --- a/src/system/kernel/debug/debug.cpp +++ b/src/system/kernel/debug/debug.cpp @@ -96,7 +96,7 @@ kputchar(char c) } -static void +void kputs(const char *s) { if (sSerialDebugEnabled) diff --git a/src/system/kernel/debug/debug_commands.cpp b/src/system/kernel/debug/debug_commands.cpp index 030e14d682..b8288dd9e2 100644 --- a/src/system/kernel/debug/debug_commands.cpp +++ b/src/system/kernel/debug/debug_commands.cpp @@ -100,7 +100,7 @@ invoke_debugger_command(struct debugger_command *command, int argc, char** argv) // and print it directly. if (argc == 2 && strcmp(argv[1], "--help") == 0 && command->usage != NULL) { kprintf("usage: %s ", command->name); - kprintf(command->usage); + kputs(command->usage); return 0; } @@ -235,7 +235,7 @@ print_debugger_command_usage(const char* commandName) // command with "--help" if (command->usage != NULL) { kprintf("usage: %s ", command->name); - kprintf(command->usage); + kputs(command->usage); } else { char* args[3] = { NULL, "--help", NULL }; invoke_debugger_command(command, 2, args);