wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1168007 (part 10) - Use PLDHashTable2 in nsDiskCacheBindery. r=froydnj.

Browse Source 
Like the last patch, the Clear() call in nsDiskCacheBindery::Init() is
cautious.
This commit is contained in:
Nicholas Nethercote 2015-05-18 21:52:14 -07:00
parent 782d4e9e0b
commit 51726d1c0b
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netwerk/cache/nsDiskCacheBinding.cpp vendored
View File

@ -132,7 +132,8 @@ const PLDHashTableOps nsDiskCacheBindery::ops =
nsDiskCacheBindery::nsDiskCacheBindery()
: initialized(false)
: table(&ops, sizeof(HashTableEntry), kInitialTableLength)
, initialized(false)
{
}
@ -143,21 +144,18 @@ nsDiskCacheBindery::~nsDiskCacheBindery()
}
nsresult
void
nsDiskCacheBindery::Init()
{
nsresult rv = NS_OK;
PL_DHashTableInit(&table, &ops, sizeof(HashTableEntry), 0);
table.ClearAndPrepareForLength(kInitialTableLength);
initialized = true;
return rv;
}
void
nsDiskCacheBindery::Reset()
{
if (initialized) {
PL_DHashTableFinish(&table);
table.ClearAndPrepareForLength(kInitialTableLength);
initialized = false;
}
}

6
netwerk/cache/nsDiskCacheBinding.h vendored
View File

@ -97,7 +97,7 @@ public:
nsDiskCacheBindery();
~nsDiskCacheBindery();
nsresult Init();
void Init();
void Reset();
nsDiskCacheBinding * CreateBinding(nsCacheEntry * entry,
@ -114,8 +114,10 @@ private:
// member variables
static const PLDHashTableOps ops;
PLDHashTable table;
PLDHashTable2 table;
bool initialized;
static const uint32_t kInitialTableLength = 0;
};
#endif /* _nsDiskCacheBinding_h_ */

6
netwerk/cache/nsDiskCacheDevice.cpp vendored
View File

@ -384,13 +384,11 @@ nsDiskCacheDevice::Init()
NS_ERROR("Disk cache already initialized!");
return NS_ERROR_UNEXPECTED;
}
if (!mCacheDirectory)
return NS_ERROR_FAILURE;
rv = mBindery.Init();
if (NS_FAILED(rv))
return rv;
mBindery.Init();
// Open Disk Cache
rv = OpenDiskCache();