Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove history logging code now that 280342 is fixed.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@171313 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smfr%smfr.org 2005-03-29 04:27:41 +00:00
parent 80daf58017
commit 98263942ca
1 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/camino/src/history/nsSimpleGlobalHistory.cpp
View File

@ -66,8 +66,6 @@
#include "nsSimpleGlobalHistory.h"
#define DEBUG_HISTORY 1 // for bug 280342
#define PREF_BRANCH_BASE "browser."
#define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days"
#define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped"
@ -1676,25 +1674,19 @@ nsSimpleGlobalHistory::OpenDB()
PRBool exists = PR_TRUE;
historyFile->Exists(&exists);
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: historyFile exists: %d\n", exists);
#endif
if (!exists || NS_FAILED(rv = OpenExistingFile(gMdbFactory, filePath.get())))
{
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: removing old history file, making new one\n");
#endif
// we couldn't open the file, so it's either corrupt or doesn't exist.
// attempt to delete the file, but ignore the error
#ifdef DEBUG_HISTORY
NS_ASSERTION(0, "Failed to open history.dat file");
#if DEBUG
nsCOMPtr<nsIFile> fileCopy;
historyFile->Clone(getter_AddRefs(fileCopy));
fileCopy->SetLeafName(NS_LITERAL_STRING("history_BAD.dat"));
fileCopy->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
nsString uniqueFileName;
fileCopy->GetLeafName(uniqueFileName);
historyFile->MoveTo(nsnull, uniqueFileName);
#else
historyFile->Remove(PR_FALSE);
@ -1719,10 +1711,6 @@ nsSimpleGlobalHistory::OpenDB()
nsresult
nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *filePath)
{
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: OpenExistingFile(%s)\n", filePath);
#endif
mdb_err err;
nsresult rv;
mdb_bool canopen = 0;
@ -1734,20 +1722,12 @@ nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *file
err = factory->OpenOldFile(mEnv, dbHeap, filePath,
dbFrozen, getter_AddRefs(oldFile));
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: OpenOldFile returned err 0x%08x (file %p)\n", err, oldFile.get());
#endif
// don't assert, the file might just not be there
if ((err !=0) || !oldFile) return NS_ERROR_FAILURE;
err = factory->CanOpenFilePort(mEnv, oldFile, // the file to investigate
&canopen, &outfmt);
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: CanOpenFilePort returned err 0x%08x (canopen %hu)\n", err, canopen);
#endif
// XXX possible that format out of date, in which case we should
// just re-write the file.
if ((err !=0) || !canopen) return NS_ERROR_FAILURE;
@ -1756,11 +1736,6 @@ nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *file
mdbOpenPolicy policy = { { 0, 0 }, 0, 0 };
err = factory->OpenFileStore(mEnv, dbHeap, oldFile, &policy, &thumb);
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: OpenFileStore returned err 0x%08x (thumb %p)\n", err, thumb);
#endif
if ((err !=0) || !thumb) return NS_ERROR_FAILURE;
mdb_count total;
@ -1778,18 +1753,10 @@ nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *file
NS_IF_RELEASE(thumb);
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: DoMore or ThumbToOpenStore returned err 0x%08x\n", err);
#endif
if (err != 0) return NS_ERROR_FAILURE;
rv = CreateTokens();
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: CreateTokens returned err 0x%08x\n", rv);
#endif
NS_ENSURE_SUCCESS(rv, rv);
mdbOid oid = { kToken_HistoryRowScope, 1 };
@ -1797,11 +1764,6 @@ nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *file
NS_ENSURE_TRUE(err == 0, NS_ERROR_FAILURE);
if (!mTable) {
NS_WARNING("Your history file is somehow corrupt.. deleting it.");
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: GetTable failed\n");
#endif
return NS_ERROR_FAILURE;
}
@ -1809,10 +1771,6 @@ nsSimpleGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *file
if (err != 0)
NS_WARNING("Could not get meta row\n");
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: GetMetaRow return err 0x%08x\n", err);
#endif
CheckHostnameEntries();
if (err != 0) return NS_ERROR_FAILURE;
@ -2099,11 +2057,6 @@ nsSimpleGlobalHistory::Commit(eCommitType commitType)
} while ((err == 0) && !broken && !done);
}
#ifdef DEBUG_HISTORY
if (err != 0)
fprintf(stderr, "HISTORY DEBUG: Commit() encountered error 0x08%x\n", err);
#endif
if (err != 0) // mork doesn't return NS error codes. Yet.
return NS_ERROR_FAILURE;
@ -2188,9 +2141,6 @@ nsSimpleGlobalHistory::CloseDB()
ExpireEntries(PR_FALSE /* don't notify */);
err = Commit(kSessionCommit);
#ifdef DEBUG_HISTORY
fprintf(stderr, "HISTORY DEBUG: Commit() in CloseDB() returned err 0x%08x\n", err);
#endif
// order is important here - logically smallest objects first
mMetaRow = nsnull;