From 878e800c67868938af7f807b2fcfea0dd0d57bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 7 Nov 2005 17:52:09 +0000 Subject: [PATCH] Applied fix by Michael. Added him to the list of authors of this file. Minor style cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14757 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/dano_message.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kits/app/dano_message.cpp b/src/kits/app/dano_message.cpp index 3a4b05db21..0d9b134872 100644 --- a/src/kits/app/dano_message.cpp +++ b/src/kits/app/dano_message.cpp @@ -3,7 +3,8 @@ * Distributed under the terms of the MIT License. * * Authors: - * Axel Dörfler + * Axel Dörfler, axeld@pinc-software.de + * Michael Lotz, mmlr@mlotz.ch */ @@ -170,14 +171,15 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream, free(fieldBuffer); throw result; } - } break; + break; + } case SECTION_FIXED_SIZE_ARRAY_DATA: { FixedSizeArray *field = (FixedSizeArray *)fieldBuffer; int32 dataOffset = sizeof(FixedSizeArray) + field->nameLength + 1; dataOffset = pad_to_8(dataOffset); - int32 count = *(int32 *)fieldBuffer + dataOffset; + int32 count = *(int32 *)(fieldBuffer + dataOffset); dataOffset += 8; /* count and padding */ if (offset + dataOffset + count * field->sizePerItem > size) @@ -196,14 +198,15 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream, dataOffset += field->sizePerItem; } - } break; + break; + } case SECTION_VARIABLE_SIZE_ARRAY_DATA: { VariableSizeArray *field = (VariableSizeArray *)fieldBuffer; int32 dataOffset = sizeof(VariableSizeArray) + field->nameLength + 1; dataOffset = pad_to_8(dataOffset); - int32 count = *(int32 *)fieldBuffer + dataOffset; + int32 count = *(int32 *)(fieldBuffer + dataOffset); dataOffset += sizeof(int32); ssize_t totalSize = *(ssize_t *)fieldBuffer + dataOffset; dataOffset += sizeof(ssize_t); @@ -223,7 +226,8 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream, throw result; } } - } break; + break; + } } free(fieldBuffer);