Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 318761 r=annie.sullivan Make unknown annotations not assert

Browse Source
This commit is contained in:
brettw%gmail.com 2005-12-02 18:33:00 +00:00
parent 817b67f190
commit c3c3843390
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/components/places/src/nsAnnotationService.cpp
View File

@ -262,7 +262,8 @@ nsAnnotationService::GetAnnotationString(nsIURI* aURI,
nsAString& _retval)
{
nsresult rv = StartGetAnnotationFromURI(aURI, aName);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv))
return rv;
rv = mDBGetAnnotationFromURI->GetString(kAnnoIndex_Content, _retval);
mDBGetAnnotationFromURI->Reset();
return rv;
@ -277,7 +278,8 @@ nsAnnotationService::GetAnnotationInt32(nsIURI* aURI,
PRInt32 *_retval)
{
nsresult rv = StartGetAnnotationFromURI(aURI, aName);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv))
return rv;
*_retval = mDBGetAnnotationFromURI->AsInt32(kAnnoIndex_Content);
mDBGetAnnotationFromURI->Reset();
return NS_OK;
@ -293,7 +295,8 @@ nsAnnotationService::GetAnnotationBinary(nsIURI* aURI,
nsACString& aMimeType)
{
nsresult rv = StartGetAnnotationFromURI(aURI, aName);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv))
return rv;
rv = mDBGetAnnotationFromURI->GetBlob(kAnnoIndex_Content, aDataLen, aData);
if (NS_FAILED(rv)) {
mDBGetAnnotationFromURI->Reset();
@ -315,7 +318,8 @@ nsAnnotationService::GetAnnotationInfo(nsIURI* aURI,
PRInt32 *aStorageType)
{
nsresult rv = StartGetAnnotationFromURI(aURI, aName);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv))
return rv;
mozStorageStatementScoper resetter(mDBGetAnnotationFromURI);
*aFlags = mDBGetAnnotationFromURI->AsInt32(kAnnoIndex_Flags);