From 4fb31bc26846e58a78fe9cef67d59999feb5511f Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Sat, 26 Jun 1999 04:58:22 +0000 Subject: [PATCH] Return an empty command enumerator instead of throwing an assertion. git-svn-id: svn://10.0.0.236/trunk@36999 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/rdf/base/src/nsInMemoryDataSource.cpp | 3 +-- mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp | 3 +-- mozilla/rdf/datasource/src/nsFindDataSource.cpp | 3 +-- mozilla/rdf/datasource/src/nsLocalStore.cpp | 4 +--- mozilla/rdf/datasource/src/nsSearchDataSource.cpp | 3 +-- mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp | 3 +-- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp index 157cc9bf1a8..5b3568d1670 100644 --- a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp +++ b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp @@ -1369,8 +1369,7 @@ NS_IMETHODIMP InMemoryDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/**/** commands) { - NS_NOTYETIMPLEMENTED("write me!"); - return NS_ERROR_NOT_IMPLEMENTED; + return(NS_NewEmptyEnumerator(commands)); } NS_IMETHODIMP diff --git a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp index 49bf8a1e472..ffcdd2f7d4f 100644 --- a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -738,8 +738,7 @@ NS_IMETHODIMP FileSystemDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/**/** commands) { - NS_NOTYETIMPLEMENTED("write me!"); - return NS_ERROR_NOT_IMPLEMENTED; + return(NS_NewEmptyEnumerator(commands)); } diff --git a/mozilla/rdf/datasource/src/nsFindDataSource.cpp b/mozilla/rdf/datasource/src/nsFindDataSource.cpp index e3f67b4bcb2..0f393e632ef 100644 --- a/mozilla/rdf/datasource/src/nsFindDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsFindDataSource.cpp @@ -854,8 +854,7 @@ FindDataSource::GetAllCommands(nsIRDFResource* source,nsIEnumerator/**/** commands) { - NS_NOTYETIMPLEMENTED("write me!"); - return NS_ERROR_NOT_IMPLEMENTED; + return(NS_NewEmptyEnumerator(commands)); } diff --git a/mozilla/rdf/datasource/src/nsLocalStore.cpp b/mozilla/rdf/datasource/src/nsLocalStore.cpp index 1ecba724563..3b0a698c5d3 100644 --- a/mozilla/rdf/datasource/src/nsLocalStore.cpp +++ b/mozilla/rdf/datasource/src/nsLocalStore.cpp @@ -316,9 +316,7 @@ NS_IMETHODIMP LocalStoreImpl::GetAllCmds(nsIRDFResource* aSource, nsISimpleEnumerator/**/** aCommands) { - // XXX Although this is the wrong thing to do, it works. I'll file a - // bug to fix it. - return NS_ERROR_FAILURE; + return(NS_NewEmptyEnumerator(aCommands)); } NS_IMETHODIMP diff --git a/mozilla/rdf/datasource/src/nsSearchDataSource.cpp b/mozilla/rdf/datasource/src/nsSearchDataSource.cpp index 34da72bd760..a1f43903019 100755 --- a/mozilla/rdf/datasource/src/nsSearchDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsSearchDataSource.cpp @@ -672,8 +672,7 @@ NS_IMETHODIMP SearchDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/**/** commands) { - NS_NOTYETIMPLEMENTED("write me!"); - return NS_ERROR_NOT_IMPLEMENTED; + return(NS_NewEmptyEnumerator(commands)); } diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index bffe6032c74..dd3eb17e394 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1216,8 +1216,7 @@ NS_IMETHODIMP nsBookmarksService::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/**/** commands) { - NS_NOTYETIMPLEMENTED("write me!"); - return NS_ERROR_NOT_IMPLEMENTED; + return(NS_NewEmptyEnumerator(commands)); } NS_IMETHODIMP