You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by db...@apache.org on 2006/09/29 23:01:37 UTC

svn commit: r451433 - in /xerces/c/branches/xerces-2.7/src/xercesc: internal/BinFileOutputStream.cpp util/BinFileInputStream.cpp

Author: dbertoni
Date: Fri Sep 29 14:01:37 2006
New Revision: 451433

URL: http://svn.apache.org/viewvc?view=rev&rev=451433
Log:
Removed unnecessary transcoding of file names, that resulted in round-trip transcoding.  Moved calls to initializer list to avoid initializing to a default value.

Modified:
    xerces/c/branches/xerces-2.7/src/xercesc/internal/BinFileOutputStream.cpp
    xerces/c/branches/xerces-2.7/src/xercesc/util/BinFileInputStream.cpp

Modified: xerces/c/branches/xerces-2.7/src/xercesc/internal/BinFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/internal/BinFileOutputStream.cpp?view=diff&rev=451433&r1=451432&r2=451433
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/internal/BinFileOutputStream.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/internal/BinFileOutputStream.cpp Fri Sep 29 14:01:37 2006
@@ -42,23 +42,16 @@
 BinFileOutputStream::BinFileOutputStream(const XMLCh*   const fileName
                                          , MemoryManager* const manager)
 
-:fSource(XERCES_Invalid_File_Handle)
+:fSource(XMLPlatformUtils::openFileToWrite(fileName, manager))
 ,fMemoryManager(manager)
 {
-    fSource = XMLPlatformUtils::openFileToWrite(fileName, manager);
 }
 
 BinFileOutputStream::BinFileOutputStream(const char*    const fileName
                                        , MemoryManager* const manager)
-:fSource(XERCES_Invalid_File_Handle)
+:fSource(XMLPlatformUtils::openFileToWrite(fileName, manager))
 ,fMemoryManager(manager)
 {
-    // Transcode the file name and put a janitor on the temp buffer
-    XMLCh* realName = XMLString::transcode(fileName, manager);
-    ArrayJanitor<XMLCh> janName(realName, manager);
-
-    // Try to open the file
-    fSource = XMLPlatformUtils::openFileToWrite(realName, manager);
 }
 
 // ---------------------------------------------------------------------------

Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/BinFileInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/BinFileInputStream.cpp?view=diff&rev=451433&r1=451432&r2=451433
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/BinFileInputStream.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/BinFileInputStream.cpp Fri Sep 29 14:01:37 2006
@@ -36,25 +36,17 @@
 BinFileInputStream::BinFileInputStream(const XMLCh* const fileName
                                        , MemoryManager* const manager) :
 
-    fSource(XERCES_Invalid_File_Handle)
+    fSource(XMLPlatformUtils::openFile(fileName, manager))
   , fMemoryManager(manager)
 {
-    // Try to open the file
-    fSource = XMLPlatformUtils::openFile(fileName, manager);
 }
 
 BinFileInputStream::BinFileInputStream(const char* const fileName,
                                        MemoryManager* const manager) :
 
-    fSource(0)
+    fSource(XMLPlatformUtils::openFile(fileName, manager))
   , fMemoryManager(manager)
 {
-    // Transcode the file name and put a janitor on the temp buffer
-    XMLCh* realName = XMLString::transcode(fileName, manager);
-    ArrayJanitor<XMLCh> janName(realName, manager);
-
-    // Try to open the file
-    fSource = XMLPlatformUtils::openFile(realName, manager);
 }
 
 BinFileInputStream::BinFileInputStream(const FileHandle toAdopt



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org