[ros-diffs] [fireball] 38353: - Fix 38352, XMLLoadFile seems to need a separate instance of Path, so revert that optimisation and leave it only to NormalizeFilename.

Author: fireball
Date: Fri Dec 26 07:25:55 2008
New Revision: 38353

URL: http://svn.reactos.org/svn/reactos?rev=38353&view=rev
Log:
- Fix 38352, XMLLoadFile seems to need a separate instance of Path, so revert that
optimisation and leave it only to NormalizeFilename.

Modified:
    trunk/reactos/tools/rbuild/module.cpp
    trunk/reactos/tools/rbuild/project.cpp

Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Fri Dec 26 07:25:55 2008
@@ -24,6 +24,8 @@
 using std::string;
 using std::vector;
 
+static const Path defaultPath;
+
 string
 Right ( const string& s, size_t n )
 {
@@ -161,8 +163,9 @@
 {
 	if ( filename == "" )
 		return "";
-	string normalizedPath = defaultPath.Fixup ( filename, true );
-	string relativeNormalizedPath = defaultPath.RelativeFromWorkingDirectory (
normalizedPath );
+	Path path;
+	string normalizedPath = path.Fixup ( filename, true );
+	string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );
 	return FixSeparator ( relativeNormalizedPath );
 }
 

Modified: trunk/reactos/tools/rbuild/project.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r…
==============================================================================
--- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Fri Dec 26 07:25:55 2008
@@ -25,8 +25,6 @@
 using std::string;
 using std::vector;
 
-const Path defaultPath;
-
 /* static */ string
 Environment::GetVariable ( const string& name )
 {
@@ -261,7 +259,8 @@
 void
 Project::ReadXml ()
 {
-	head = XMLLoadFile ( xmlfile, defaultPath, xmlbuildfiles );
+	Path path;
+	head = XMLLoadFile ( xmlfile, path, xmlbuildfiles );
 	node = NULL;
 	for ( size_t i = 0; i < head->subElements.size (); i++ )
 	{