Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 22:55:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 471018 - Warning: nsFaviconService.cpp: outparam 'aHasData' not written on NS_SUCCEEDED(return value); r=dietrich

Browse Source
This commit is contained in:
Ehsan Akhgari 2009-01-03 07:42:34 +03:30
parent 10bb72ee35
commit 63d1be936d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/components/places/src/nsFaviconService.cpp
View File

@ -291,7 +291,6 @@ nsFaviconService::SetFaviconUrlForPage(nsIURI* aPageURI, nsIURI* aFaviconURI)
NS_ENSURE_ARG_POINTER(aPageURI);
NS_ENSURE_ARG_POINTER(aFaviconURI);
// we don't care if there was data
PRBool hasData;
nsresult rv = SetFaviconUrlForPageInternal(aPageURI, aFaviconURI, &hasData);
NS_ENSURE_SUCCESS(rv, rv);
@ -337,6 +336,14 @@ nsFaviconService::SetFaviconUrlForPageInternal(nsIURI* aPageURI,
{
nsresult rv;
PRInt64 iconId = -1;
*aHasData = PR_FALSE;
nsNavHistory* historyService = nsNavHistory::GetHistoryService();
NS_ENSURE_TRUE(historyService, NS_ERROR_OUT_OF_MEMORY);
if (historyService->InPrivateBrowsingMode())
return NS_OK;
mozStorageTransaction transaction(mDBConn, PR_FALSE);
{
mozStorageStatementScoper scoper(mDBGetIconInfo);
@ -358,15 +365,8 @@ nsFaviconService::SetFaviconUrlForPageInternal(nsIURI* aPageURI,
}
}
nsNavHistory* historyService = nsNavHistory::GetHistoryService();
NS_ENSURE_TRUE(historyService, NS_ERROR_OUT_OF_MEMORY);
if (historyService->InPrivateBrowsingMode())
return NS_OK;
if (iconId == -1) {
// We did not find any entry, so create a new one
*aHasData = PR_FALSE;
// not-binded params are automatically nullified by mozStorage
mozStorageStatementScoper scoper(mDBInsertIcon);