i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug.c -> debug.cpp

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23511 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-01-14 09:50:32 +00:00
parent f9f49bb963
commit 9d2cde7183
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/Jamfile
+1 -1
View File
@@ -4,7 +4,7 @@ UsePrivateHeaders [ FDirName kernel debug ] syslog_daemon ;
KernelMergeObject kernel_debug.o : KernelMergeObject kernel_debug.o :
blue_screen.cpp blue_screen.cpp
debug.c debug.cpp
frame_buffer_console.cpp frame_buffer_console.cpp
gdb.c gdb.c
tracing.cpp tracing.cpp
src/system/kernel/debug/debug.c → src/system/kernel/debug/debug.cpp
+5 -5
View File
@@ -503,14 +503,14 @@ syslog_sender(void *data)
acquire_spinlock(&sSpinlock); acquire_spinlock(&sSpinlock);
length = ring_buffer_readable(sSyslogBuffer); length = ring_buffer_readable(sSyslogBuffer);
if (length > SYSLOG_MAX_MESSAGE_LENGTH) if (length > (int32)SYSLOG_MAX_MESSAGE_LENGTH)
length = SYSLOG_MAX_MESSAGE_LENGTH; length = SYSLOG_MAX_MESSAGE_LENGTH;
length = ring_buffer_read(sSyslogBuffer, length = ring_buffer_read(sSyslogBuffer,
(uint8 *)sSyslogMessage->message, length); (uint8 *)sSyslogMessage->message, length);
if (sSyslogDropped) { if (sSyslogDropped) {
// add drop marker // add drop marker
if (length < SYSLOG_MAX_MESSAGE_LENGTH - 6) if (length < (int32)SYSLOG_MAX_MESSAGE_LENGTH - 6)
strlcat(sSyslogMessage->message, "<DROP>", SYSLOG_MAX_MESSAGE_LENGTH); strlcat(sSyslogMessage->message, "<DROP>", SYSLOG_MAX_MESSAGE_LENGTH);
else if (length > 7) else if (length > 7)
strcpy(sSyslogMessage->message + length - 7, "<DROP>"); strcpy(sSyslogMessage->message + length - 7, "<DROP>");
@@ -558,7 +558,7 @@ syslog_write(const char *text, int32 length)
if (sSyslogBuffer == NULL) if (sSyslogBuffer == NULL)
return; return;
if (ring_buffer_writable(sSyslogBuffer) < length) { if ((int32)ring_buffer_writable(sSyslogBuffer) < length) {
// truncate data // truncate data
length = ring_buffer_writable(sSyslogBuffer); length = ring_buffer_writable(sSyslogBuffer);
@@ -610,7 +610,7 @@ syslog_init(struct kernel_args *args)
if (!sSyslogOutputEnabled) if (!sSyslogOutputEnabled)
return B_OK; return B_OK;
sSyslogMessage = malloc(SYSLOG_MESSAGE_BUFFER_SIZE); sSyslogMessage = (syslog_message*)malloc(SYSLOG_MESSAGE_BUFFER_SIZE);
if (sSyslogMessage == NULL) { if (sSyslogMessage == NULL) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
goto err1; goto err1;
@@ -630,7 +630,7 @@ syslog_init(struct kernel_args *args)
//strcpy(sSyslogMessage->ident, "KERNEL"); //strcpy(sSyslogMessage->ident, "KERNEL");
if (args->debug_output != NULL) if (args->debug_output != NULL)
syslog_write(args->debug_output, args->debug_size); syslog_write((const char*)args->debug_output, args->debug_size);
return B_OK; return B_OK;
src/system/kernel/debug/gdb.h
+4 -1
View File
@@ -5,6 +5,9 @@
#ifndef _KERNEL_GDB_H #ifndef _KERNEL_GDB_H
#define _KERNEL_GDB_H #define _KERNEL_GDB_H
extern int cmd_gdb(int, char **); #ifdef __cplusplus
extern "C"
#endif
int cmd_gdb(int, char **);
#endif #endif