diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index 313530efe37..a38e743fcf2 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -151,7 +151,10 @@ nsrefcnt nsJAR::Release(void) return 0; } else if (1 == count && mCache) { - nsresult rv = mCache->ReleaseZip(this); +#ifdef DEBUG + nsresult rv = +#endif + mCache->ReleaseZip(this); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to release zip file"); } return count; @@ -1150,7 +1153,10 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result) return rv; } - PRBool collision = mZips.Put(&key, static_cast(zip)); // AddRefs to 2 +#ifdef DEBUG + PRBool collision = +#endif + mZips.Put(&key, static_cast(zip)); // AddRefs to 2 NS_ASSERTION(!collision, "horked"); } *result = zip; @@ -1304,8 +1310,10 @@ nsZipReaderCache::ReleaseZip(nsJAR* zip) } nsCStringKey key(uri); - PRBool removed; - removed = mZips.Remove(&key); // Releases +#ifdef DEBUG + PRBool removed = +#endif + mZips.Remove(&key); // Releases NS_ASSERTION(removed, "botched"); return NS_OK; @@ -1337,7 +1345,10 @@ nsZipReaderCache::Observe(nsISupports *aSubject, mZips.Enumerate(FindFlushableZip, &flushable); if ( ! flushable ) break; - PRBool removed = mZips.Remove(flushable); // Releases +#ifdef DEBUG + PRBool removed = +#endif + mZips.Remove(flushable); // Releases NS_ASSERTION(removed, "botched"); #ifdef xDEBUG_jband diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index ae57fd6d5fe..d65675d6034 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -94,7 +94,10 @@ public: , mContentLength(-1) { if (fullJarURI) { - nsresult rv = fullJarURI->GetAsciiSpec(mJarDirSpec); +#ifdef DEBUG + nsresult rv = +#endif + fullJarURI->GetAsciiSpec(mJarDirSpec); NS_ASSERTION(NS_SUCCEEDED(rv), "this shouldn't fail"); } } diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index 0914124b0ad..b8e59d9358a 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -1002,7 +1002,10 @@ nsZipCursor::nsZipCursor(nsZipItem *item, nsZipArchive *aZip, PRUint8* aBuf, PRU mDoCRC(doCRC) { if (mItem->Compression() == DEFLATED) { - nsresult status = gZlibInit(&mZs); +#ifdef DEBUG + nsresult status = +#endif + gZlibInit(&mZs); NS_ASSERTION(status == NS_OK, "Zlib failed to initialize"); NS_ASSERTION(aBuf, "Must pass in a buffer for DEFLATED nsZipItem"); }