fix for bug 108988 r=caillon@returnzero.com, sr=blake

also fix a minor warning while I'm there


git-svn-id: svn://10.0.0.236/trunk@113535 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com 2002-02-02 21:13:10 +00:00
parent d357e19dc2
commit eeea2a1861
2 changed files with 13 additions and 4 deletions

View File

@ -1127,8 +1127,17 @@ nsGlobalHistory::IsVisited(const char *aURL, PRBool *_retval)
nsCOMPtr<nsIMdbRow> row;
rv = FindRow(kToken_URLColumn, aURL, getter_AddRefs(row));
if (NS_FAILED(rv))
*_retval = PR_FALSE;
if (NS_FAILED(rv)) {
// now try it with a "/" appended?
rv = FindRow(kToken_URLColumn,
PromiseFlatCString(nsDependentCString(aURL) +
nsDependentCString("/")).get(),
getter_AddRefs(row));
if (NS_FAILED(rv))
*_retval = PR_FALSE;
else
*_retval = PR_TRUE;
}
else
*_retval = PR_TRUE;
@ -2392,7 +2401,7 @@ nsGlobalHistory::CreateFindEnumerator(nsIRDFResource *aSource,
nsresult
nsGlobalHistory::CheckHostnameEntries()
{
nsresult rv;
nsresult rv = NS_OK;
mdb_err err;

View File

@ -409,8 +409,8 @@ protected:
AutocompleteExclude* aExclude) :
mHistory(aHistory),
mURLColumn(aURLColumn),
mCommentColumn(aCommentColumn),
mHiddenColumn(aHiddenColumn),
mCommentColumn(aCommentColumn),
mExclude(aExclude),
mSelectValue(aSelectValue) {}