diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 9396b8538b4..2b350dce0a3 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1869,7 +1869,7 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins() break; for (nsDirectoryIterator iter(pluginsDir); iter; iter++) { - const nsNativeFileSpec& file = iter; + const nsFileSpec& file = iter; if (pluginsDir.IsPluginFile(file)) { nsPluginFile pluginFile(file); // load the plugin's library so we can ask it some questions. @@ -2270,7 +2270,7 @@ printf("plugin %s added to list %s\n", plugintag->mName, (plugintag->mFlags & NS // private methods -PRLibrary* nsPluginHostImpl::LoadPluginLibrary(const nsNativeFileSpec &pluginSpec) +PRLibrary* nsPluginHostImpl::LoadPluginLibrary(const nsFileSpec &pluginSpec) { PRLibrary* plugin = NULL; diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h index 474b8a7b2e2..72c91bd641a 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h @@ -30,7 +30,7 @@ #include "nsPluginsDir.h" class ns4xPlugin; -class nsNativeFileSpec; +class nsFileSpec; class nsPluginTag { @@ -216,7 +216,7 @@ private: nsresult NewFullPagePluginStream(nsIStreamListener *&aStreamListener, nsIPluginInstance *aInstance); - PRLibrary* LoadPluginLibrary(const nsNativeFileSpec &pluginSpec); + PRLibrary* LoadPluginLibrary(const nsFileSpec &pluginSpec); PRLibrary* LoadPluginLibrary(const char* pluginPath, const char* path); diff --git a/mozilla/modules/plugin/base/src/nsPluginsDir.h b/mozilla/modules/plugin/base/src/nsPluginsDir.h index edb233d85b8..640d4ae24d7 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDir.h +++ b/mozilla/modules/plugin/base/src/nsPluginsDir.h @@ -26,9 +26,9 @@ * Provides a cross-platform way to obtain the location of the plugins * directory. Once constructed, can be used with nsDirectoryIterator to * scan the plugins directory. An nsPluginFileSpec can be constructed from the - * nsNativeFileSpec returned by the iterator. + * nsFileSpec returned by the iterator. */ -class nsPluginsDir : public nsNativeFileSpec { +class nsPluginsDir : public nsFileSpec { public: /** * Locates the plugins directory in a platform-dependent manner. @@ -39,7 +39,7 @@ public: /** * Determines whether or not the given file is actually a plugin file. */ - PRBool IsPluginFile(const nsNativeFileSpec& fileSpec); + PRBool IsPluginFile(const nsFileSpec& fileSpec); }; struct PRLibrary; @@ -62,14 +62,14 @@ struct nsPluginInfo { * library. Insulates core nsIPluginHost implementations from these * details. */ -class nsPluginFile : public nsNativeFileSpec { +class nsPluginFile : public nsFileSpec { public: /** * If spec corresponds to a valid plugin file, constructs a reference * to a plugin file on disk. Plugins are typically located using the * nsPluginsDir class. */ - nsPluginFile(const nsNativeFileSpec& spec); + nsPluginFile(const nsFileSpec& spec); virtual ~nsPluginFile(); /** diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp index d585d78b380..7bceca86c5f 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp @@ -33,10 +33,10 @@ #include #include -static nsresult getApplicationDir(nsNativeFileSpec& outAppDir) +static nsresult getApplicationDir(nsFileSpec& outAppDir) { // Use the process manager to get the application's FSSpec, - // then construct an nsNativeFileSpec that encapsulates it. + // then construct an nsFileSpec that encapsulates it. FSSpec spec; ProcessInfoRec info; info.processInfoLength = sizeof(info); @@ -44,7 +44,7 @@ static nsresult getApplicationDir(nsNativeFileSpec& outAppDir) info.processAppSpec = &spec; ProcessSerialNumber psn = { 0, kCurrentProcess }; OSErr result = GetProcessInformation(&psn, &info); - nsNativeFileSpec appSpec(spec); + nsFileSpec appSpec(spec); appSpec.GetParent(outAppDir); return NS_OK; } @@ -66,7 +66,7 @@ nsPluginsDir::nsPluginsDir() nsPluginsDir::~nsPluginsDir() {} -PRBool nsPluginsDir::IsPluginFile(const nsNativeFileSpec& fileSpec) +PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec) { // look at file's creator/type and make sure it is a code fragment, etc. FInfo info; @@ -77,8 +77,8 @@ PRBool nsPluginsDir::IsPluginFile(const nsNativeFileSpec& fileSpec) return false; } -nsPluginFile::nsPluginFile(const nsNativeFileSpec& spec) - : nsNativeFileSpec(spec) +nsPluginFile::nsPluginFile(const nsFileSpec& spec) + : nsFileSpec(spec) { } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 9396b8538b4..2b350dce0a3 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -1869,7 +1869,7 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins() break; for (nsDirectoryIterator iter(pluginsDir); iter; iter++) { - const nsNativeFileSpec& file = iter; + const nsFileSpec& file = iter; if (pluginsDir.IsPluginFile(file)) { nsPluginFile pluginFile(file); // load the plugin's library so we can ask it some questions. @@ -2270,7 +2270,7 @@ printf("plugin %s added to list %s\n", plugintag->mName, (plugintag->mFlags & NS // private methods -PRLibrary* nsPluginHostImpl::LoadPluginLibrary(const nsNativeFileSpec &pluginSpec) +PRLibrary* nsPluginHostImpl::LoadPluginLibrary(const nsFileSpec &pluginSpec) { PRLibrary* plugin = NULL; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h index 474b8a7b2e2..72c91bd641a 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h @@ -30,7 +30,7 @@ #include "nsPluginsDir.h" class ns4xPlugin; -class nsNativeFileSpec; +class nsFileSpec; class nsPluginTag { @@ -216,7 +216,7 @@ private: nsresult NewFullPagePluginStream(nsIStreamListener *&aStreamListener, nsIPluginInstance *aInstance); - PRLibrary* LoadPluginLibrary(const nsNativeFileSpec &pluginSpec); + PRLibrary* LoadPluginLibrary(const nsFileSpec &pluginSpec); PRLibrary* LoadPluginLibrary(const char* pluginPath, const char* path); diff --git a/mozilla/modules/plugin/nglsrc/nsPluginsDir.h b/mozilla/modules/plugin/nglsrc/nsPluginsDir.h index edb233d85b8..640d4ae24d7 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginsDir.h +++ b/mozilla/modules/plugin/nglsrc/nsPluginsDir.h @@ -26,9 +26,9 @@ * Provides a cross-platform way to obtain the location of the plugins * directory. Once constructed, can be used with nsDirectoryIterator to * scan the plugins directory. An nsPluginFileSpec can be constructed from the - * nsNativeFileSpec returned by the iterator. + * nsFileSpec returned by the iterator. */ -class nsPluginsDir : public nsNativeFileSpec { +class nsPluginsDir : public nsFileSpec { public: /** * Locates the plugins directory in a platform-dependent manner. @@ -39,7 +39,7 @@ public: /** * Determines whether or not the given file is actually a plugin file. */ - PRBool IsPluginFile(const nsNativeFileSpec& fileSpec); + PRBool IsPluginFile(const nsFileSpec& fileSpec); }; struct PRLibrary; @@ -62,14 +62,14 @@ struct nsPluginInfo { * library. Insulates core nsIPluginHost implementations from these * details. */ -class nsPluginFile : public nsNativeFileSpec { +class nsPluginFile : public nsFileSpec { public: /** * If spec corresponds to a valid plugin file, constructs a reference * to a plugin file on disk. Plugins are typically located using the * nsPluginsDir class. */ - nsPluginFile(const nsNativeFileSpec& spec); + nsPluginFile(const nsFileSpec& spec); virtual ~nsPluginFile(); /** diff --git a/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp b/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp index d585d78b380..7bceca86c5f 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp @@ -33,10 +33,10 @@ #include #include -static nsresult getApplicationDir(nsNativeFileSpec& outAppDir) +static nsresult getApplicationDir(nsFileSpec& outAppDir) { // Use the process manager to get the application's FSSpec, - // then construct an nsNativeFileSpec that encapsulates it. + // then construct an nsFileSpec that encapsulates it. FSSpec spec; ProcessInfoRec info; info.processInfoLength = sizeof(info); @@ -44,7 +44,7 @@ static nsresult getApplicationDir(nsNativeFileSpec& outAppDir) info.processAppSpec = &spec; ProcessSerialNumber psn = { 0, kCurrentProcess }; OSErr result = GetProcessInformation(&psn, &info); - nsNativeFileSpec appSpec(spec); + nsFileSpec appSpec(spec); appSpec.GetParent(outAppDir); return NS_OK; } @@ -66,7 +66,7 @@ nsPluginsDir::nsPluginsDir() nsPluginsDir::~nsPluginsDir() {} -PRBool nsPluginsDir::IsPluginFile(const nsNativeFileSpec& fileSpec) +PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec) { // look at file's creator/type and make sure it is a code fragment, etc. FInfo info; @@ -77,8 +77,8 @@ PRBool nsPluginsDir::IsPluginFile(const nsNativeFileSpec& fileSpec) return false; } -nsPluginFile::nsPluginFile(const nsNativeFileSpec& spec) - : nsNativeFileSpec(spec) +nsPluginFile::nsPluginFile(const nsFileSpec& spec) + : nsFileSpec(spec) { } diff --git a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp index 5989a55cba6..0c3332e41f3 100644 --- a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp @@ -71,7 +71,6 @@ static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID); static NS_DEFINE_IID(kIInputStreamIID, NS_IINPUTSTREAM_IID); static NS_DEFINE_IID(kINameSpaceManagerIID, NS_INAMESPACEMANAGER_IID); -static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID); static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kIRDFContentSinkIID, NS_IRDFCONTENTSINK_IID); static NS_DEFINE_IID(kIRDFDataSourceIID, NS_IRDFDATASOURCE_IID); @@ -96,58 +95,6 @@ static NS_DEFINE_CID(kWellFormedDTDCID, NS_WELLFORMEDDTD_CID); DEFINE_RDF_VOCAB(RDF_NAMESPACE_URI, RDF, instanceOf); DEFINE_RDF_VOCAB(RDF_NAMESPACE_URI, RDF, nextVal); - -//////////////////////////////////////////////////////////////////////// -// FileOutputStreamImpl - -// XXX Eventually, it'd be nice if we could just open an output stream -// on a URL. That'd obsolete the need for this... - -class FileOutputStreamImpl : public nsIOutputStream -{ -private: - nsOutputFileStream mStream; - -public: - FileOutputStreamImpl(const nsFilePath& path) - : mStream(path) - { - NS_INIT_REFCNT(); - } - - virtual ~FileOutputStreamImpl(void) { - Close(); - } - - // nsISupports interface - NS_DECL_ISUPPORTS - - // nsIBaseStream interface - NS_IMETHOD Close(void) { - mStream.close(); - return NS_OK; - } - - // nsIOutputStream interface - NS_IMETHOD Write(const char* aBuf, - PRUint32 aOffset, - PRUint32 aCount, - PRUint32 *aWriteCount) - { - PRInt32 written = mStream.write(aBuf + aOffset, aCount); - if (written == -1) { - *aWriteCount = 0; - return NS_ERROR_FAILURE; // XXX right error code? - } - else { - *aWriteCount = written; - return NS_OK; - } - } -}; - -NS_IMPL_ISUPPORTS(FileOutputStreamImpl, kIOutputStreamIID); - //////////////////////////////////////////////////////////////////////// class ProxyStream : public nsIInputStream @@ -705,21 +652,19 @@ RDFXMLDataSourceImpl::Flush(void) return rv; nsFileURL url(uri); - nsFilePath path(url); + nsFileSpec path(url); - FileOutputStreamImpl* out = new FileOutputStreamImpl(path); - if (! out) - return NS_ERROR_OUT_OF_MEMORY; + nsOutputFileStream out(path); + if (! out.is_open()) + return NS_ERROR_FAILURE; - NS_ADDREF(out); - - if (NS_FAILED(rv = Serialize(out))) + nsCOMPtr outIStream = out.GetIStream(); + if (NS_FAILED(rv = Serialize(outIStream))) goto done; mIsDirty = PR_FALSE; done: - NS_IF_RELEASE(out); return NS_OK; }