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

Use fHeapOffset instead of sizeof(hpkg_header)

Browse Source
This commit is contained in:
Ingo Weinhold
2011-07-17 16:54:55 +02:00
parent abbeb15ac4
commit 04258e4741
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/hpkg/PackageWriterImpl.cpp
+3 -4
View File
@@ -448,7 +448,7 @@ PackageWriterImpl::_Finish()
_AddEntry(AT_FDCWD, entry, entry->Name(), pathBuffer); _AddEntry(AT_FDCWD, entry, entry->Name(), pathBuffer);
} }
off_t heapSize = fHeapEnd - sizeof(hpkg_header); off_t heapSize = fHeapEnd - fHeapOffset;
hpkg_header header; hpkg_header header;
@@ -458,7 +458,7 @@ PackageWriterImpl::_Finish()
off_t totalSize = fHeapEnd; off_t totalSize = fHeapEnd;
fListener->OnPackageSizeInfo(sizeof(hpkg_header), heapSize, fListener->OnPackageSizeInfo(fHeapOffset, heapSize,
B_BENDIAN_TO_HOST_INT64(header.toc_length_compressed), B_BENDIAN_TO_HOST_INT64(header.toc_length_compressed),
B_BENDIAN_TO_HOST_INT32(header.attributes_length_compressed), B_BENDIAN_TO_HOST_INT32(header.attributes_length_compressed),
totalSize); totalSize);
@@ -467,8 +467,7 @@ PackageWriterImpl::_Finish()
// general // general
header.magic = B_HOST_TO_BENDIAN_INT32(B_HPKG_MAGIC); header.magic = B_HOST_TO_BENDIAN_INT32(B_HPKG_MAGIC);
header.header_size = B_HOST_TO_BENDIAN_INT16( header.header_size = B_HOST_TO_BENDIAN_INT16((uint16)fHeapOffset);
(uint16)sizeof(hpkg_header));
header.version = B_HOST_TO_BENDIAN_INT16(B_HPKG_VERSION); header.version = B_HOST_TO_BENDIAN_INT16(B_HPKG_VERSION);
header.total_size = B_HOST_TO_BENDIAN_INT64(totalSize); header.total_size = B_HOST_TO_BENDIAN_INT64(totalSize);