From a31ddcb397416b3b604fd8b48a514661f5782c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 3 Jan 2006 09:22:27 +0000 Subject: [PATCH] Forgot to include this in the last commit: added big endian support to R5 format. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15805 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Message4.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/kits/app/Message4.cpp b/src/kits/app/Message4.cpp index 4527409438..1fbe3ea72b 100644 --- a/src/kits/app/Message4.cpp +++ b/src/kits/app/Message4.cpp @@ -393,11 +393,10 @@ void BMessage::PrintToStream() const { DEBUG_FUNCTION_ENTER; - printf("BMessage: what = "); int32 value = B_BENDIAN_TO_HOST_INT32(what); - printf("%.4s", (char *)&value); - printf(" (0x%lx, or %ld)\n", what, what); + printf("BMessage: what = '%.4s' (0x%lx, or %ld)\n", + (char *)&value, what, what); char buffer[1024]; field_header *field = fFields; @@ -871,7 +870,7 @@ BMessage::Unflatten(const char *flatBuffer) } if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped) - return BPrivate::unflatten_r5_message(this, flatBuffer); + return BPrivate::unflatten_r5_message(format, this, flatBuffer); if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped) { BMemoryIO stream(flatBuffer + sizeof(uint32), @@ -939,7 +938,7 @@ BMessage::Unflatten(BDataIO *stream) stream->Read(&format, sizeof(uint32)); if (format != kMessageMagic4) { if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped) - return BPrivate::unflatten_r5_message(this, stream); + return BPrivate::unflatten_r5_message(format, this, stream); if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped) return BPrivate::unflatten_dano_message(format, *stream, *this);