From 0bd0d75242780d48e6628fccfc6b5cd6d011b72f Mon Sep 17 00:00:00 2001 From: "gordon%netscape.com" Date: Tue, 13 May 2003 23:15:20 +0000 Subject: [PATCH] Fix bug 204398, fixing alignment of about:cache. patch=abecevello@sympatico.ca, r=gordon, sr=darin, a=asa git-svn-id: svn://10.0.0.236/trunk@142389 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp | 7 ++----- mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp | 8 +++----- mozilla/netwerk/protocol/about/src/nsAboutCache.cpp | 4 +--- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp index 4a68a7ff3ba..e5311646b7f 100644 --- a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp +++ b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp @@ -199,9 +199,7 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) NS_ENSURE_ARG_POINTER(usageReport); nsCString buffer; - buffer.Assign("\n"); - - buffer.Append("\n\n"); + buffer.Append("\n\n"); // buffer.Append(""); - buffer.Append("
Cache Directory: "); + buffer.Append("\n
Cache Directory: "); nsCOMPtr cacheDir; nsAutoString path; mDevice->getCacheDirectory(getter_AddRefs(cacheDir)); @@ -211,9 +209,8 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) } else { buffer.Append("directory unavailable"); } - buffer.Append("
Files: XXX
"); *usageReport = ToNewCString(buffer); if (!*usageReport) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp index 0eb5671d509..2f7de628f40 100644 --- a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp +++ b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp @@ -522,12 +522,10 @@ nsMemoryCacheDeviceInfo::GetUsageReport(char ** result) NS_ENSURE_ARG_POINTER(result); nsCString buffer; - buffer.Assign("\n"); - buffer.Append("\n\n\n"); - buffer.Append("
Inactive Storage: "); + buffer.Append("\n
Inactive Storage: "); buffer.AppendInt(mDevice->mInactiveSize / 1024); - buffer.Append(" k
\n"); - + buffer.Append(" k\n\n"); + *result = ToNewCString(buffer); if (!*result) return NS_ERROR_OUT_OF_MEMORY; return NS_OK; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp index 41e9cf73151..b13b722a800 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp @@ -198,11 +198,9 @@ nsAboutCache::VisitDevice(const char *deviceID, mBuffer.AppendInt(value/1024); mBuffer.Append(" k\n\n"); - mBuffer.Append("\n"); - deviceInfo->GetUsageReport(getter_Copies(str)); mBuffer.Append(str); - mBuffer.Append("\n
"); + mBuffer.Append("\n\n
"); if (mDeviceID.IsEmpty()) { mBuffer.Append("\n