diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2008-08-13 04:00:00 +0400 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:15:56 +0300 |
| commit | 173c07e166fdf6fcd20f18ea73008f1b628945df (patch) | |
| tree | 13ebea85cdc4c16ae93714ff0627ee9f91ad7e08 /CPP/7zip/Common/MemBlocks.cpp | |
| parent | 3901bf0ab88106a5b031cba7bc18d60cdebf7eef (diff) | |
4.59 beta
Diffstat (limited to 'CPP/7zip/Common/MemBlocks.cpp')
| -rwxr-xr-x | CPP/7zip/Common/MemBlocks.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CPP/7zip/Common/MemBlocks.cpp b/CPP/7zip/Common/MemBlocks.cpp index 53f55242..baceb163 100755 --- a/CPP/7zip/Common/MemBlocks.cpp +++ b/CPP/7zip/Common/MemBlocks.cpp @@ -13,7 +13,7 @@ bool CMemBlockManager::AllocateSpace(size_t numBlocks) if (_blockSize < sizeof(void *) || numBlocks < 1) return false; size_t totalSize = numBlocks * _blockSize; - if (totalSize / _blockSize != numBlocks) + if (totalSize / _blockSize != numBlocks) return false; _data = ::MidAlloc(totalSize); if (_data == 0) @@ -36,7 +36,7 @@ void CMemBlockManager::FreeSpace() void *CMemBlockManager::AllocateBlock() { if (_headFree == 0) - return 0; + return 0; void *p = _headFree; _headFree = *(void **)_headFree; return p; @@ -114,7 +114,7 @@ void CMemBlocks::Free(CMemBlockManagerMt *manager) void CMemBlocks::FreeOpt(CMemBlockManagerMt *manager) { Free(manager); - Blocks.Free(); // to reduce memory usage + Blocks.ClearAndFree(); } HRESULT CMemBlocks::WriteToStream(size_t blockSize, ISequentialOutStream *outStream) const @@ -150,8 +150,8 @@ void CMemLockBlocks::Free(CMemBlockManagerMt *memManager) TotalSize = 0; } -HRes CMemLockBlocks::SwitchToNoLockMode(CMemBlockManagerMt *memManager) -{ +HRes CMemLockBlocks::SwitchToNoLockMode(CMemBlockManagerMt *memManager) +{ if (LockMode) { if (Blocks.Size() > 0) |