Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Flatten() and FlattenedSize() implementation so the unit tests pass now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@813 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
jrand 2002-08-19 04:13:06 +00:00
parent add155b5b7
commit 3841621d26
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kits/app/PropertyInfo.cpp
View File

@ -135,7 +135,7 @@ type_code BPropertyInfo::TypeCode() const
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
ssize_t BPropertyInfo::FlattenedSize() const ssize_t BPropertyInfo::FlattenedSize() const
{ {
size_t size = 2 * sizeof(int32); size_t size = (2 * sizeof(int32)) + 1;
if (fPropInfo) if (fPropInfo)
{ {
@ -182,12 +182,12 @@ ssize_t BPropertyInfo::FlattenedSize() const
if (fValueInfo) if (fValueInfo)
{ {
size_t size = sizeof(int32); size += sizeof(int16);
// Chunks // Chunks
for (int32 vi = 0; fValueInfo[vi].name != NULL; vi++) for (int32 vi = 0; fValueInfo[vi].name != NULL; vi++)
{ {
size += sizeof(int16); size += sizeof(int32);
size += sizeof(int32); size += sizeof(int32);
size += strlen(fValueInfo[vi].name) + 1; size += strlen(fValueInfo[vi].name) + 1;
@ -221,8 +221,9 @@ status_t BPropertyInfo::Flatten(void *buffer, ssize_t numBytes) const
charPtr = (char*)buffer; charPtr = (char*)buffer;
*(charPtr++) = 0;
*(intPtr++) = CountProperties(); *(intPtr++) = CountProperties();
*(intPtr++) = (fPropInfo ? 0x1 : 0x0) | (fValueInfo ? 0x2 : 0x0); *(intPtr++) = 0x01 | (fValueInfo ? 0x2 : 0x0);
if (fPropInfo) if (fPropInfo)
{ {
@ -275,9 +276,10 @@ status_t BPropertyInfo::Flatten(void *buffer, ssize_t numBytes) const
if (fValueInfo) if (fValueInfo)
{ {
// Chunks // Chunks
*(wrdPtr++) = CountValues();
for (int32 vi = 0; fValueInfo[vi].name != NULL; vi++) for (int32 vi = 0; fValueInfo[vi].name != NULL; vi++)
{ {
*(wrdPtr++) = fValueInfo[vi].kind; *(intPtr++) = fValueInfo[vi].kind;
*(intPtr++) = fValueInfo[vi].value; *(intPtr++) = fValueInfo[vi].value;
strcpy(charPtr, fValueInfo[vi].name); strcpy(charPtr, fValueInfo[vi].name);