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 967941, part 3 - Smart pointerize nsZipReaderCache methods. r=aklotz

Browse Source
This commit is contained in:
Andrew McCreight 2014-02-24 17:16:11 -08:00
parent 8b96b79451
commit d5b71baec5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/libjar/nsJAR.cpp
View File

@ -1110,8 +1110,8 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
nsJAR* zip;
mZips.Get(uri, &zip);
nsRefPtr<nsJAR> zip;
mZips.Get(uri, getter_AddRefs(zip));
if (zip) {
#ifdef ZIP_CACHE_HIT_RATE
mZipCacheHits++;
@ -1119,19 +1119,17 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
zip->ClearReleaseTime();
} else {
zip = new nsJAR();
NS_ADDREF(zip);
zip->SetZipReaderCache(this);
rv = zip->Open(zipFile);
if (NS_FAILED(rv)) {
NS_RELEASE(zip);
return rv;
}
MOZ_ASSERT(!mZips.Contains(uri));
mZips.Put(uri, zip);
}
*result = zip;
zip.forget(result);
return rv;
}
@ -1157,8 +1155,8 @@ nsZipReaderCache::GetInnerZip(nsIFile* zipFile, const nsACString &entry,
uri.AppendLiteral("!/");
uri.Append(entry);
nsJAR* zip;
mZips.Get(uri, &zip);
nsRefPtr<nsJAR> zip;
mZips.Get(uri, getter_AddRefs(zip));
if (zip) {
#ifdef ZIP_CACHE_HIT_RATE
mZipCacheHits++;
@ -1166,19 +1164,17 @@ nsZipReaderCache::GetInnerZip(nsIFile* zipFile, const nsACString &entry,
zip->ClearReleaseTime();
} else {
zip = new nsJAR();
NS_ADDREF(zip);
zip->SetZipReaderCache(this);
rv = zip->OpenInner(outerZipReader, entry);
if (NS_FAILED(rv)) {
NS_RELEASE(zip);
return rv;
}
MOZ_ASSERT(!mZips.Contains(uri));
mZips.Put(uri, zip);
}
*result = zip;
zip.forget(result);
return rv;
}
@ -1322,8 +1318,9 @@ nsZipReaderCache::Observe(nsISupports *aSubject,
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
MutexAutoLock lock(mLock);
nsJAR* zip;
mZips.Get(uri, &zip);
nsRefPtr<nsJAR> zip;
mZips.Get(uri, getter_AddRefs(zip));
if (!zip)
return NS_OK;
@ -1334,7 +1331,6 @@ nsZipReaderCache::Observe(nsISupports *aSubject,
zip->SetZipReaderCache(nullptr);
mZips.Remove(uri);
NS_RELEASE(zip);
}
return NS_OK;
}